From 9d49c8a12539224f922b6350225e351d3ecc4197 Mon Sep 17 00:00:00 2001 From: Rathna Natarajan Date: Wed, 3 Jul 2019 09:45:11 -0700 Subject: [PATCH 1/3] Fix to handle query string --- param.json | 2 +- .../PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.md5 | 2 +- .../PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.xml | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/param.json b/param.json index 94934ee..452a646 100644 --- a/param.json +++ b/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" } \ No newline at end of file diff --git a/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.md5 b/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.md5 index 4b7097e..3b39928 100644 --- a/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.md5 +++ b/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.md5 @@ -1 +1 @@ -034f4708296332260654ba2407d10019 \ No newline at end of file +5c00d816d985ea7c7edd5fccdcc5ea26 \ No newline at end of file diff --git a/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.xml b/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.xml index a40bf24..f34c986 100644 --- a/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.xml +++ b/src/main/resources/apiproject/PrimaryStore-e80e7788-1aec-4d7b-a83c-d2975f1151e3.xml @@ -7704,6 +7704,10 @@ .jar application/x-java-archive + + + */* + .pdf application/pdf @@ -13270,7 +13274,7 @@ Passed script filter Get Path from X-Cf-Forwarded-Url - import java.net.URI; def invoke(msg) { def url = msg.get("url"); def URI = new URI(url); def path = URI.getRawPath(); msg.put("path",path); def httpHeaders = msg.get("http.headers"); def port = URI.getPort(); if ( port == -1) { httpHeaders.setHeader("Host", URI.getHost()); } else{ httpHeaders.setHeader("Host", URI.getHost() + ":" + port); } return true; } + import java.net.URI; def invoke(msg) { def url = msg.get("url"); def URI = new URI(url); def path = URI.getRawPath(); def queryString = URI.getRawQuery(); path = path + (queryString == null ? "" : '?' + queryString); msg.put("path",path); def httpHeaders = msg.get("http.headers"); def port = URI.getPort(); if ( port == -1) { httpHeaders.setHeader("Host", URI.getHost()); } else{ httpHeaders.setHeader("Host", URI.getHost() + ":" + port); } return true; } 2331372335669071159 From 5ccf17508867019e1d7e3592ca540f50089aa336 Mon Sep 17 00:00:00 2001 From: Rathna Natarajan Date: Wed, 3 Jul 2019 09:59:21 -0700 Subject: [PATCH 2/3] Disable same user to create multiple service instance --- .../apim/servicebroker/service/AxwayServiceBrokerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/axway/apim/servicebroker/service/AxwayServiceBrokerImpl.java b/src/main/java/com/axway/apim/servicebroker/service/AxwayServiceBrokerImpl.java index 2f92568..0ff03af 100644 --- a/src/main/java/com/axway/apim/servicebroker/service/AxwayServiceBrokerImpl.java +++ b/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"); } From 8b533f246bf716751b2d9ee20f664d381ff91007 Mon Sep 17 00:00:00 2001 From: Rathna Natarajan Date: Wed, 3 Jul 2019 09:59:59 -0700 Subject: [PATCH 3/3] Change release version --- manifest.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.yml b/manifest.yml index 2743af5..5639293 100644 --- a/manifest.yml +++ b/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 \ No newline at end of file diff --git a/pom.xml b/pom.xml index bfa65c5..33cd230 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.axway.apim apim-service-broker - 1.1.6 + 1.1.7 jar axway-apim-service-broker Axway APIM Service Broker