Also making sure OAuth-Provider profile isn't exported with internal ID

Author: Chris Wiechmann

modules/apis/src/main/java/com/axway/apim/api/export/ExportAPI.java

@@ -117,6 +117,16 @@ public List<AuthenticationProfile> getAuthenticationProfiles() {
 			if(this.actualAPIProxy.getAuthenticationProfiles().get(0).getType()==AuthType.none)
 			return null;
 		}
+		for(AuthenticationProfile profile : this.actualAPIProxy.getAuthenticationProfiles()) {
+			if(profile.getType()==AuthType.oauth) {
+				String providerProfile = (String)profile.getParameters().get("providerProfile");
+				if(providerProfile.startsWith("<key")) {
+					providerProfile = providerProfile.substring(providerProfile.indexOf("<key type='OAuthAppProfile'>"));
+					providerProfile = providerProfile.substring(providerProfile.indexOf("value='")+7, providerProfile.lastIndexOf("'/></key>"));
+				}
+				profile.getParameters().put("providerProfile", providerProfile);
+			}
+		}
 		return this.actualAPIProxy.getAuthenticationProfiles();
 	}
 

modules/apis/src/test/java/com/axway/apim/export/test/customPolicies/CustomPoliciesTestIT.java

@@ -1,6 +1,7 @@
 package com.axway.apim.export.test.customPolicies;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import java.io.File;
@@ -106,6 +107,8 @@ private void exportAPI(TestContext context, boolean ignoreAdminAccount) throws F
 		Map<String, OutboundProfile> importedOutboundProfiles = mapper.convertValue(importedAPIConfig.get("outboundProfiles"), new TypeReference<Map<String, OutboundProfile>>(){});
 		Map<String, OutboundProfile> exportedOutboundProfiles = mapper.convertValue(exportedAPIConfig.get("outboundProfiles"), new TypeReference<Map<String, OutboundProfile>>(){});
 		assertEquals(importedOutboundProfiles, exportedOutboundProfiles, "OutboundProfiles are not equal.");
+		assertFalse(exportedAPIConfig.get("outboundProfiles").get("_default").get("requestPolicy").asText().startsWith("<key"), "Request policy should not start with <key");
+		assertFalse(exportedAPIConfig.get("outboundProfiles").get("_default").get("responsePolicy").asText().startsWith("<key"), "Request policy should not start with <key");
 
 		TagMap<String, String[]> importedTags = mapper.convertValue(importedAPIConfig.get("tags"), new TypeReference<TagMap<String, String[]>>(){});
 		TagMap<String, String[]> exportedTags = mapper.convertValue(exportedAPIConfig.get("tags"), new TypeReference<TagMap<String, String[]>>(){});