Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5E151200CA3 for ; Tue, 2 May 2017 18:49:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5CF0C160BAB; Tue, 2 May 2017 16:49:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 72CC8160BD0 for ; Tue, 2 May 2017 18:49:18 +0200 (CEST) Received: (qmail 19102 invoked by uid 500); 2 May 2017 16:49:17 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 17901 invoked by uid 99); 2 May 2017 16:49:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 May 2017 16:49:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CC01DFD78; Tue, 2 May 2017 16:49:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anujbhan@apache.org To: commits@airavata.apache.org Date: Tue, 02 May 2017 16:49:37 -0000 Message-Id: <9afd666ca4d44be0990f7a4612e9cad9@git.apache.org> In-Reply-To: <29d5e94ff160494ea7a47ea6db4dcc3d@git.apache.org> References: <29d5e94ff160494ea7a47ea6db4dcc3d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/23] airavata git commit: minor change archived-at: Tue, 02 May 2017 16:49:19 -0000 minor change Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/96bdea2d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/96bdea2d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/96bdea2d Branch: refs/heads/develop Commit: 96bdea2d043ab19a9b1d4f3762a4ca3086f9e1c0 Parents: 686d8e3 Author: Anuj Bhandar Authored: Mon May 1 20:45:48 2017 -0400 Committer: Anuj Bhandar Committed: Mon May 1 20:45:48 2017 -0400 ---------------------------------------------------------------------- .../core/impl/TenantManagementKeycloakImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/96bdea2d/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java ---------------------------------------------------------------------- diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java index 5c07980..5f4b417 100644 --- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java +++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java @@ -174,6 +174,18 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface { String[] defaultRoles = {"gateway-user"}; pgaClient.setDefaultRoles(defaultRoles); List redirectUris = new ArrayList<>(); + if(gatewayDetails.getGatewayURL()!=null){ + if(gatewayDetails.getGatewayURL().endsWith("/")){ + redirectUris.add(gatewayDetails.getGatewayURL() + "callback-url"); + } else { + redirectUris.add(gatewayDetails.getGatewayURL() + "/callback-url"); + } + } else { + logger.error("Request for Realm Client Creation failed, callback URL not present"); + IamAdminServicesException ex = new IamAdminServicesException(); + ex.setMessage("Gateway Url field in GatewayProfile cannot be empty, Relam Client creation failed"); + throw ex; + } redirectUris.add("http://accord.scigap.org/callback-url"); pgaClient.setRedirectUris(redirectUris); pgaClient.setPublicClient(false);