Bugfix, when changing Desired-Scope name

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/clientApps/APIMgrAppsAdapter.java

@@ -643,11 +643,11 @@ private void getScopes2AddOrUpdate(ClientApplication actualApp, ClientApplicatio
 			existingScopes = actualApp.getOauthResources();
 		}
 		if(existingScopes==null) existingScopes = new ArrayList<ClientAppOauthResource>();
-		boolean existingScopeFound = false;
 		if(desiredScopes!=null) {
 			// Iterate over the given desired scopes
 			Iterator<ClientAppOauthResource> it = desiredScopes.iterator();
 			while(it.hasNext()) {
+				boolean existingScopeFound = false;
 				ClientAppOauthResource desiredScope = it.next();
 				// Compare each desired scope, if it is already included in the existing scopes
 				for(ClientAppOauthResource existingScope : existingScopes) {

modules/apps/src/test/resources/com/axway/apim/appimport/apps/basic/CompleteApplicationWithOauthResources.json

@@ -1,28 +1,37 @@
 {
-  "name" : "${appName}",
-  "organization" : "${orgName}",
-  "description" : "${description}",
-  "state" : "${state}",
-  "image" : "${appImage}",
-  "enabled" : true,
-  "email" : "${email}",
-  "phone" : "${phone}",
-  "credentials" : [ {
-    "credentialType" : "oauth",
-    "enabled" : true,
-    "secret" : "9cb76d80-1bc2-48d3-8d31-edeec0fddf6c",
-    "corsOrigins" : [ ],
-    "cert" : "app-oauth-cert.crt",
-    "type" : "confidential",
-    "clientId" : "ClientConfidentialApp-${appNumber}",
-    "redirectUrls" : [ "https://localhost:8088/client/apigateway/callback", "https://oauthclient:8088/client/apigateway/callback" ]
-  }],
-  "oauthResources" : [{
-	  "scope": "${scope1}",
-	  "isDefault": ${isDefault1}  
-	  },
-	  {
-		  "scope": "${scope2}",
-		  "isDefault": ${isDefault2}    }
-	  ]
+  "name": "${appName}",
+  "organization": "${orgName}",
+  "description": "${description}",
+  "state": "${state}",
+  "image": "${appImage}",
+  "enabled": true,
+  "email": "${email}",
+  "phone": "${phone}",
+  "credentials": [
+    {
+      "credentialType": "oauth",
+      "enabled": true,
+      "secret": "9cb76d80-1bc2-48d3-8d31-edeec0fddf6c",
+      "corsOrigins": [
+        
+      ],
+      "cert": "app-oauth-cert.crt",
+      "type": "confidential",
+      "clientId": "ClientConfidentialApp-${appNumber}",
+      "redirectUrls": [
+        "https://localhost:8088/client/apigateway/callback",
+        "https://oauthclient:8088/client/apigateway/callback"
+      ]
+    }
+  ],
+  "appScopes": [
+    {
+      "scope": "${scope1}",
+      "isDefault": ${isDefault1}
+    },
+    {
+      "scope": "${scope2}",
+      "isDefault": ${isDefault2}
+    }
+  ]
 }