Bump carbon.identity-inbound-auth-oauth.version from 6.4.2 to 6.4.21

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/APIDefinition.java

@@ -40,7 +40,6 @@
 public abstract class APIDefinition {
 
     private static final Pattern CURLY_BRACES_PATTERN = Pattern.compile("(?<=\\{)(?!\\s*\\{)[^{}]+");
-    public static final String KEEP_LEGACY_EXTENSION_PROP = "preserveLegacyExtensions";
 
     /**
      * This method generates Mock/Sample payloads for API prototyping
@@ -147,16 +146,6 @@ public abstract APIDefinitionValidationResponse validateAPIDefinition(String api
     public abstract String populateCustomManagementInfo(String oasDefinition, SwaggerData swaggerData)
             throws APIManagementException;
 
-    /**
-     * Check extension migration is disabled
-     *
-     * @return boolean
-     */
-    protected boolean isLegacyExtensionsPreserved() {
-        String keepLegacyExtension = System.getProperty(KEEP_LEGACY_EXTENSION_PROP);
-        return Boolean.parseBoolean(keepLegacyExtension);
-    }
-
     /**
      * Update the OAS definition for API consumers
      *

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/APIManager.java

@@ -453,9 +453,34 @@ Map<Integer, APIKey> searchAccessToken(String searchType, String searchTerm, Str
      * @param tenantid   tenant id
      * @return true if the scope key is already available
      * @throws APIManagementException if failed to check the context availability
+     * @deprecated Use isScopeKeyAssignedLocally() instead.
      */
+    @Deprecated
     boolean isScopeKeyAssigned(APIIdentifier identifier, String scopeKey, int tenantid) throws APIManagementException;
 
+    /**
+     * Check whether the given scope key is already assigned to any API under given tenant.
+     *
+     * @param scopeKey     Scope
+     * @param tenantDomain Tenant Domain
+     * @return true if scope is attached to an API
+     * @throws APIManagementException if failed to check the assignment
+     */
+    boolean isScopeKeyAssignedToAPI(String scopeKey, String tenantDomain) throws APIManagementException;
+
+    /**
+     * Check whether the given scope key is already assigned to an API as local scope under given tenant.
+     * This will return false if those APIs are different versions of the same API.
+     *
+     * @param apiIdentifier API Identifier
+     * @param scopeKey   candidate scope key
+     * @param tenantId   tenant Id
+     * @return true if the scope key is already attached as a local scope in any API
+     * @throws APIManagementException if failed to check the local scope availability
+     */
+    boolean isScopeKeyAssignedLocally(APIIdentifier apiIdentifier, String scopeKey, int tenantId)
+            throws APIManagementException;
+
     /**
      * Check if a given context template already exists
      *

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/APIProvider.java

@@ -1328,4 +1328,79 @@ List<APIResource> getResourcesToBeRemovedFromAPIProducts(APIIdentifier apiId, St
      * @return List of removed resources that are reused among API Products
      */
     List<APIResource> getRemovedProductResources(Set<URITemplate> updatedUriTemplates, API existingAPI);
+
+    /**
+     * Check whether the given scope name exists as a shared scope in the tenant domain.
+     *
+     * @param scopeName    Shared Scope name
+     * @param tenantDomain Tenant Domain
+     * @return Scope availability
+     * @throws APIManagementException if failed to check the availability
+     */
+    boolean isSharedScopeNameExists(String scopeName, String tenantDomain) throws APIManagementException;
+
+    /**
+     * Add a shared scope.
+     *
+     * @param scope        Shared Scope
+     * @param tenantDomain Tenant domain
+     * @return UUID of the added Shared Scope
+     * @throws APIManagementException if failed to add a scope
+     */
+    String addSharedScope(Scope scope, String tenantDomain) throws APIManagementException;
+
+    /**
+     * Get all available shared scopes.
+     *
+     * @param tenantDomain tenant domain
+     * @return Shared Scope list
+     * @throws APIManagementException if failed to get the scope list
+     */
+    List<Scope> getAllSharedScopes(String tenantDomain) throws APIManagementException;
+
+    /**
+     * Get all available shared scope keys.
+     *
+     * @param tenantDomain tenant domain
+     * @return Shared Scope Keyset
+     * @throws APIManagementException if failed to get the scope key set
+     */
+    Set<String> getAllSharedScopeKeys(String tenantDomain) throws APIManagementException;
+
+    /**
+     * Get shared scope by UUID.
+     *
+     * @param sharedScopeId Shared scope Id
+     * @param tenantDomain  tenant domain
+     * @return Shared Scope
+     * @throws APIManagementException If failed to get the scope
+     */
+    Scope getSharedScopeByUUID(String sharedScopeId, String tenantDomain) throws APIManagementException;
+
+    /**
+     * Delete shared scope.
+     *
+     * @param scopeName Shared scope name
+     * @param tenantDomain  tenant domain
+     * @throws APIManagementException If failed to delete the scope
+     */
+    void deleteSharedScope(String scopeName, String tenantDomain) throws APIManagementException;
+
+    /**
+     * Update a shared scope.
+     *
+     * @param sharedScope  Shared Scope
+     * @param tenantDomain tenant domain
+     * @throws APIManagementException If failed to update
+     */
+    void updateSharedScope(Scope sharedScope, String tenantDomain) throws APIManagementException;
+
+    /**
+     * Validate a shared scopes set. Add the additional attributes (scope description, bindings etc).
+     *
+     * @param scopes       Shared scopes set
+     * @param tenantDomain Tenant domain
+     * @throws APIManagementException If failed to validate
+     */
+    void validateSharedScopes(Set<Scope> scopes, String tenantDomain) throws APIManagementException;
 }

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java

@@ -254,11 +254,19 @@ public enum ExceptionCodes implements ErrorHandler {
             "exist"),
     BLOCK_CONDITION_ALREADY_EXISTS(900979, "The Block Condition exists.", 409, " The Block Condition already exists"),
     SYSTEM_APP_NOT_FOUND(900980, "System Application not found", 409, "System Application not found"),
-    SCOPE_NOT_FOUND(900981, "Scope not found", 404, "Scope could not be found"),
-    SCOPE_ALREADY_REGISTERED(900982, "Scope already exist", 409, "Scope already exist"),
-    SCOPE_DELETE_FAILED(900983, "Scope couldn't get deleted", 400, "Scope couldn't get deleted"),
-    SCOPE_REGISTRATION_FAILED(900984, "Scope registration failed", 400, "Scope registration failed"),
-    SCOPE_VALIDATION_FAILED(900985, "Scope validation failed", 412, "Scope validation failed"),
+
+    SHARED_SCOPE_NOT_FOUND(900981, "Shared Scope not found", 404,
+            "Requested Shared Scope ID  %s could not be found"),
+    SHARED_SCOPE_ID_NOT_SPECIFIED(900982, "Shared Scope ID not specified", 400,
+            "Shared Scope ID not specified"),
+    SHARED_SCOPE_NAME_NOT_SPECIFIED(900983, "Shared Scope name not specified", 400,
+            "Shared Scope name not specified"),
+    SCOPE_ALREADY_REGISTERED(900984, "Scope already exists", 409, "Scope %s already exists"),
+    SHARED_SCOPE_ALREADY_ATTACHED(900985, "Shared Scope already attached", 409,
+            "Shared Scope %s is already used by one or more APIs"),
+    SCOPE_VALIDATION_FAILED(900986, "Scope validation failed", 412, "Scope validation failed"),
+    SHARED_SCOPE_DISPLAY_NAME_NOT_SPECIFIED(900987, "Shared Scope display name not specified", 400,
+            "Shared Scope display name not specified"),
 
     //Dedicated container based gateway related Codes
     NO_RESOURCE_LOADED_FROM_DEFINITION(900990, "Container based resource Not Found", 404, "No resource loaded from " +