You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/10/11 20:42:30 UTC
[airavata-custos] 23/24: corrected typos and addressed review
comments
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit baaea62220da77ba7fdb2e76984a6d097b1468e5
Author: Aarushi <aa...@gmail.com>
AuthorDate: Thu Oct 10 13:02:53 2019 -0400
corrected typos and addressed review comments
---
clients/python/README.md | 2 +-
clients/python/airavata_custos/sample_settings.ini | 2 +-
clients/python/airavata_custos/security/keycloak_connectors.py | 4 ++--
clients/python/requirements_dev.txt | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/clients/python/README.md b/clients/python/README.md
index dd70088..7cfef23 100644
--- a/clients/python/README.md
+++ b/clients/python/README.md
@@ -23,7 +23,7 @@ Install dependencies
Server configuration should be kept in a INI file in the following format. For more information refer to sample_settings.ini file
- [IAMSeverSettings]
+ [IAMServerSettings]
KEYCLOAK_AUTHORIZE_URL =
KEYCLOAK_TOKEN_URL =
KEYCLOAK_USERINFO_URL =
diff --git a/clients/python/airavata_custos/sample_settings.ini b/clients/python/airavata_custos/sample_settings.ini
index 18eb04b..2af0074 100644
--- a/clients/python/airavata_custos/sample_settings.ini
+++ b/clients/python/airavata_custos/sample_settings.ini
@@ -1,4 +1,4 @@
-[IAMSeverSettings]
+[IAMServerSettings]
KEYCLOAK_AUTHORIZE_URL = https://localhost:8443/auth/realms/default/protocol/openid-connect/auth
KEYCLOAK_TOKEN_URL = https://localhost:8443/auth/realms/default/protocol/openid-connect/token
KEYCLOAK_USERINFO_URL = https://localhost:8443/auth/realms/default/protocol/openid-connect/userinfo
diff --git a/clients/python/airavata_custos/security/keycloak_connectors.py b/clients/python/airavata_custos/security/keycloak_connectors.py
index cf105f7..6b30df7 100644
--- a/clients/python/airavata_custos/security/keycloak_connectors.py
+++ b/clients/python/airavata_custos/security/keycloak_connectors.py
@@ -80,7 +80,7 @@ class KeycloakBackend(object):
:param idp_alias: name of the idp
:return: object of class IdpCredentials
"""
- redirect_uri += '?idp_alias=' + quote(idp_alias)
+
base_authorize_url = self.keycloak_settings.KEYCLOAK_AUTHORIZE_URL
oauth2_session = OAuth2Session(client_id, scope='openid', redirect_uri=redirect_uri)
authorization_url, state = oauth2_session.authorization_url(base_authorize_url)
@@ -161,7 +161,7 @@ class KeycloakBackend(object):
def _load_settings(self, configuration_file_location):
config = configparser.ConfigParser()
config.read(configuration_file_location)
- settings = config['IAMSeverSettings']
+ settings = config['IAMServerSettings']
self.keycloak_settings.KEYCLOAK_AUTHORIZE_URL = settings['KEYCLOAK_AUTHORIZE_URL']
self.keycloak_settings.KEYCLOAK_LOGOUT_URL = settings['KEYCLOAK_LOGOUT_URL']
self.keycloak_settings.KEYCLOAK_TOKEN_URL = settings['KEYCLOAK_TOKEN_URL']
diff --git a/clients/python/requirements_dev.txt b/clients/python/requirements_dev.txt
index e0209cb..0c4db3a 100644
--- a/clients/python/requirements_dev.txt
+++ b/clients/python/requirements_dev.txt
@@ -16,4 +16,3 @@ requests_oauthlib==1.2.0
requests==2.22.0
thrift_connector==0.24
thrift==0.11.0
-configparser==4.0.2