Merge branch 'dev' into unicron-make-active-signature-ttl-in-store-shorter

Author: lukaszgryglicki

cla-backend/cla/controllers/repository_service.py

@@ -34,16 +34,18 @@ def sign_request(provider, installation_id, github_repository_id, change_request
     service = cla.utils.get_repository_service(provider)
     return service.sign_request(installation_id, github_repository_id, change_request_id, request)
 
-def user_from_session(request, response=None):
+def user_from_session(redirect, request, response=None):
     """
     Return user from OAuth2 session
     """
     # LG: to test using MockGitHub class
     # import os
     # from cla.models.github_models import MockGitHub
     # user = MockGitHub(os.environ["GITHUB_OAUTH_TOKEN"]).user_from_session(request)
-    user = cla.utils.get_repository_service('github').user_from_session(request)
+    user = cla.utils.get_repository_service('github').user_from_session(request, redirect)
     if user is None:
         response.status = HTTP_404
         return {"errors": "Cannot find user from session"}
+    if isinstance(user, dict):
+        return user
     return user.to_dict()

cla-backend/cla/models/github_models.py

@@ -96,7 +96,7 @@ def received_activity(self, data):
         else:
             cla.log.debug("github_models.received_activity - Ignoring unsupported action: {}".format(data["action"]))
 
-    def user_from_session(self, request):
+    def user_from_session(self, request, redirect):
         fn = "github_models.user_from_session"  # function name
         cla.log.debug(f"{fn} - Loading session from request: {request}...")
         session = self._get_request_session(request)
@@ -111,7 +111,10 @@ def user_from_session(self, request):
             cla.log.debug(f"{fn} - Obtained GitHub OAuth2 state from authorization - storing state in the session...")
             session["github_oauth2_state"] = state
             cla.log.debug(f"{fn} - GitHub OAuth2 request with state {state} - sending user to {authorization_url}")
-            raise falcon.HTTPFound(authorization_url)
+            if redirect:
+                raise falcon.HTTPFound(authorization_url)
+            else:
+                return { "redirect_url": authorization_url }
 
     def sign_request(self, installation_id, github_repository_id, change_request_id, request):
         """

cla-backend/cla/routes.py

@@ -1833,7 +1833,9 @@ def user_from_session(request, response):
       "version": "v1"
     }
     """
-    return cla.controllers.repository_service.user_from_session(request, response)
+    raw_redirect = request.params.get('redirect', 'false').lower()
+    redirect = raw_redirect in ('1', 'true', 'yes')
+    return cla.controllers.repository_service.user_from_session(redirect, request, response)
 
 
 @hug.post("/events", versions=1)

utils/get_user_from_session_py.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 # API_URL=https://[xyz].ngrok-free.app (defaults to localhost:5000)
 # API_URL=https://api.lfcla.dev.platform.linuxfoundation.org
-# DEBUG='' ./utils/get_user_from_session_py.sh
+# REDIRECT=0|1 DEBUG='' ./utils/get_user_from_session_py.sh
 
 if [ -z "$API_URL" ]
 then
   export API_URL="http://localhost:5000"
 fi
 
-API="${API_URL}/v2/user-from-session"
+if [ -z "${REDIRECT}" ]
+then
+  export REDIRECT="0"
+fi
+
+API="${API_URL}/v2/user-from-session?redirect=${REDIRECT}"
 
 if [ ! -z "$DEBUG" ]
 then