Merge pull request teamhephy#56 from jianxiaoguo/main

chore(oauth): modify passport api
duanhongyi · Aug 13, 2021 · 009d27b · 009d27b
2 parents cf43590 + cad913c
commit 009d27b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/charts/controller/templates/_helpers.tpl b/charts/controller/templates/_helpers.tpl
@@ -148,15 +148,15 @@ env:
 - name: "SOCIAL_AUTH_DRYCC_ACCESS_TOKEN_URL"
   value: "$(DRYCC_PASSPORT_DOMAIN)/oauth/token/"
 - name: "SOCIAL_AUTH_DRYCC_ACCESS_API_URL"
-  value: "$(DRYCC_PASSPORT_DOMAIN)/users/"
+  value: "$(DRYCC_PASSPORT_DOMAIN)"
 - name: "SOCIAL_AUTH_DRYCC_USERINFO_URL"
   value: "$(DRYCC_PASSPORT_DOMAIN)/oauth/userinfo/"
 - name: "SOCIAL_AUTH_DRYCC_JWKS_URI"
   value: "$(DRYCC_PASSPORT_DOMAIN)/oauth/.well-known/jwks.json"
 - name: "SOCIAL_AUTH_DRYCC_OIDC_ENDPOINT"
   value: "$(DRYCC_PASSPORT_DOMAIN)/oauth"
 - name: "LOGIN_REDIRECT_URL"
-  value: "$(DRYCC_PASSPORT_DOMAIN)/login/done/"
+  value: "$(DRYCC_PASSPORT_DOMAIN)/user/login/done/"
 - name: SOCIAL_AUTH_DRYCC_CONTROLLER_KEY
   valueFrom:
     secretKeyRef:

diff --git a/rootfs/api/backend.py b/rootfs/api/backend.py
@@ -67,7 +67,7 @@ def get_user_details(self, response):
 
     def user_data(self, access_token, *args, **kwargs):
         """Loads user data from service"""
-        url = settings.SOCIAL_AUTH_DRYCC_ACCESS_API_URL
+        url = settings.SOCIAL_AUTH_DRYCC_USERINFO_URL
         return self.get_json(url, headers={
             'authorization': 'Bearer ' + access_token})
 

diff --git a/rootfs/api/oauth.py b/rootfs/api/oauth.py
@@ -15,14 +15,14 @@ def __init__(self):
         self.client = OAuth2Session(self.client_id, self.client_secret)
 
     def get_user_by_token(self, token: str) -> Dict:
-        response = requests.get(f'{self.api_url}/users', headers={
+        response = requests.get(f'{self.api_url}/user/info/', headers={
             'Authorization': f'Bearer {token}'
         })
         result = response.json()
         return result
 
     def get_email_by_token(self, token: str) -> Dict:
-        response = requests.get(f'{self.api_url}/users/emails', headers={
+        response = requests.get(f'{self.api_url}/user/email/', headers={
             'Authorization': f'Bearer {token}'
         })
         result = response.json()