Merge pull request #4 from Axway-API-Management-Plus/develop

Develop

manifest.yml

@@ -3,5 +3,5 @@ applications:
 - name: axway-apim-service-broker
   memory: 1G
   random-route: true
-  path: target/apim-service-broker-1.1.6.jar
+  path: target/apim-service-broker-1.1.7.jar
 

param.json

@@ -1,5 +1,5 @@
 {
 	"apiname": "pcftest",
 	"type":"swagger",
-	"uri": "http://greeting-app-interested-fossa.apps.sanpablo.cf-app.com/api/v3/swagger.json"
+	"uri": "http://greeting-app-talkative-squirrel.apps.tokyo.cf-app.com/api/v3/swagger.json"
 }

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.axway.apim</groupId>
 	<artifactId>apim-service-broker</artifactId>
-	<version>1.1.6</version>
+	<version>1.1.7</version>
 	<packaging>jar</packaging>
 	<name>axway-apim-service-broker</name>
 	<description>Axway APIM Service Broker</description>

src/main/java/com/axway/apim/servicebroker/service/AxwayServiceBrokerImpl.java

@@ -136,6 +136,11 @@ public boolean createOrgAndUser(String orgName, String email, String serviceInst
 			return false;
 		}
 
+		// Check whether the  user is already associated  with some other organization
+		if( apiUser.getOrganizationId() != null){
+			throw new AxwayException("A user with the supplied login name already exists");
+		}
+
 		orgId = axwayOrganzationClient.createOrganization(orgName, email, serviceInstanceId);
 		String userId = axwayUserClient.createUser(orgId, email);
 		axwayUserClient.resetPassword(userId);
@@ -167,7 +172,7 @@ public boolean deleteOrgAppAndUser(String email, String serviceInstanceId) throw
 			String apiId = apiOrganizationAccess.getApiId();
 			FrondendAPI frondendAPI = axwayAPIClient.getAPI(apiId);
 			if (frondendAPI.getState().equals(PUBLISHED)) {
-				logger.info("Publised APIs are avaialble under the organization");
+				logger.info("Published APIs are available under the organization");
 				throw new AxwayException(
 						"Can't delete Organization as it has published API, Please unpublish the API from API Manager");
 			}

src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.md5

@@ -1 +1 @@
-034f4708296332260654ba2407d10019
+5c00d816d985ea7c7edd5fccdcc5ea26

src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.xml

@@ -7704,6 +7704,10 @@
 	<fval name="extension"><value>.jar</value></fval>
 	<fval name="mimeType"><value>application/x-java-archive</value></fval>
 </entity>
+<entity xmlns="http://www.vordel.com/2005/06/24/entityStore"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="MimeType" entityPK="3917188602117604194" parentPK="-8492238750300463192">
+	<fval name="extension"><value></value></fval>
+	<fval name="mimeType"><value>*/*</value></fval>
+</entity>
 <entity xmlns="http://www.vordel.com/2005/06/24/entityStore"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="MimeType" entityPK="3945297027673230918" parentPK="-8492238750300463192">
 	<fval name="extension"><value>.pdf</value></fval>
 	<fval name="mimeType"><value>application/pdf</value></fval>
@@ -13270,7 +13274,7 @@
 	<fval name="logSuccess"><value>Passed script filter</value></fval>
 	<fval name="name"><value>Get Path from X-Cf-Forwarded-Url</value></fval>
 	<fval name="requiredProperties"></fval>
-	<fval name="script"><value>import java.net.URI;&#xD;&#xA;&#xD;&#xA;def invoke(msg)         &#xD;&#xA;{&#xD;&#xA;    def url = msg.get(&quot;url&quot;);        &#xD;&#xA;    def URI  = new URI(url);&#xD;&#xA;    def path = URI.getRawPath();&#xD;&#xA;    msg.put(&quot;path&quot;,path);&#xD;&#xA;    def httpHeaders = msg.get(&quot;http.headers&quot;);&#xD;&#xA;    def port = URI.getPort();&#xD;&#xA;    if ( port == -1) {&#xD;&#xA;&#x9;  httpHeaders.setHeader(&quot;Host&quot;, URI.getHost());&#xD;&#xA;  }  else{&#xD;&#xA;    httpHeaders.setHeader(&quot;Host&quot;, URI.getHost() + &quot;:&quot; + port);&#xD;&#xA; }&#xD;&#xA;    return true;        &#xD;&#xA;}</value></fval>
+	<fval name="script"><value>import java.net.URI;&#xD;&#xA;&#xD;&#xA;def invoke(msg)         &#xD;&#xA;{&#xD;&#xA;    def url = msg.get(&quot;url&quot;);        &#xD;&#xA;    def URI  = new URI(url);&#xD;&#xA;    def path = URI.getRawPath();&#xD;&#xA;    def queryString = URI.getRawQuery();&#xD;&#xA;    path = path + (queryString == null ? &quot;&quot; : &apos;?&apos; + queryString);&#xD;&#xA;    msg.put(&quot;path&quot;,path);&#xD;&#xA;    def httpHeaders = msg.get(&quot;http.headers&quot;);&#xD;&#xA;    def port = URI.getPort();&#xD;&#xA;    if ( port == -1) {&#xD;&#xA;&#x9;  httpHeaders.setHeader(&quot;Host&quot;, URI.getHost());&#xD;&#xA;  }  else{&#xD;&#xA;    httpHeaders.setHeader(&quot;Host&quot;, URI.getHost() + &quot;:&quot; + port);&#xD;&#xA; }&#xD;&#xA;    return true;        &#xD;&#xA;}</value></fval>
 	<fval name="successNode"><value contentType="reference">2331372335669071159</value></fval>
 </entity>
 <entity xmlns="http://www.vordel.com/2005/06/24/entityStore"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="AttributeExtractHTTPHeaderFilter" entityPK="8895625963261121359" parentPK="361572352584357271">