finished google oauth

Author: briancaffey

backend/accounts/utils/social/oauth.py

@@ -1,3 +1,4 @@
+import json
 import os
 from urllib import parse
 
@@ -8,9 +9,9 @@
 
 def get_payload(backend, code):
 
-
-    key = f"{backend.upper()}_KEY"
-    secret = f"{backend.upper()}_SECRET"
+    # this might need a better solution
+    key = f"{backend.upper()}_KEY".replace("-", "_")
+    secret = f"{backend.upper()}_SECRET".replace("-", "_")
 
     client_id = os.environ.get(key, "nokey")
     client_secret = os.environ.get(secret, "nosecret")
@@ -23,12 +24,12 @@ def get_payload(backend, code):
         'client_secret': client_secret,
     }
 
-    elif backend == 'google_oauth2':
+    elif backend == 'google-oauth2':
         payload = {
         'code': code,
         'client_id': client_id,
         'client_secret': client_secret,
-        'redirect_uri': "http://localhost/auth/google/callback",
+        'redirect_uri': "http://localhost/auth/google-oauth2/callback",
         'grant_type': "authorization_code"
     }
 
@@ -44,8 +45,31 @@ def get_access_token_from_code(backend, code):
 
     r = requests.post(url, data=payload)
 
-    # TODO: cleanup logic
-    url = "http://example.com?" + str(r.content)
-    params = dict(parse.parse_qsl(parse.urlsplit(url).query))
+    # different providers have different responses to their oauth endpoints
+    # for example:
+
+    # github returns this:
+    #
+    #   b'access_token=76e9d25ed009fb7feroifjf0f58jf9rneb0b6b&scope=user&token_type=bearer'
+    if backend == "github":
+
+        # TODO: cleanup logic
+        url = "http://example.com?" + str(r.content)
+        params = dict(parse.parse_qsl(parse.urlsplit(url).query))
+
+        return params["b'access_token"]
+
+
+    # google returns this:
+    # {
+    #   'access_token': 'ya29.frejf8erf.erferfeg.erfeogOS9tzAPQlNlUXitkMbmSt',
+    #   'expires_in': 3596,
+    #   'scope': 'openid https://www.googleapis.com/auth/userinfo.email',
+    #   'token_type': 'Bearer',
+    #   'id_token': 'oierfoie940j.ferferfoprek/refpekf9efoeik.long token'
+    # }
+    elif backend == "google-oauth2":
+
+        token = r.json()['access_token']
 
-    return params["b'access_token"]
+        return token

backend/core/constants.py

@@ -6,8 +6,8 @@
         'name': 'github',
         'url':'https://github.com/login/oauth/access_token'
     },
-    'google': {
-        'name': 'google_oauth2',
+    'google-oauth2': {
+        'name': 'google-oauth2',
         'url':'https://oauth2.googleapis.com/token'
     }
 }

quasar/src/components/AuthModal.vue

@@ -56,7 +56,7 @@
               label="Sign Up with GitHub"
             />
             <q-btn
-              :href="$store.getters.oauthUrl('google')"
+              :href="$store.getters.oauthUrl('google-oauth2')"
               type="a"
               class="full-width q-mt-md"
               label="Sign Up with Google"

quasar/src/utils/oauth.js

@@ -11,14 +11,14 @@ const oauth = {
       state: "eworifjeovivoiej"
     }
   },
-  google: {
+  "google-oauth2": {
     url: "https://accounts.google.com/o/oauth2/v2/auth",
     params: {
       client_id: process.env.GOOGLE_OAUTH2_KEY,
       response_type: "code",
       scope: "openid email",
-      redirect_uri: `${url}/auth/google/callback`,
-      state: "eworifjeovivoiej",
+      redirect_uri: `${url}/auth/google-oauth2/callback`,
+      state: "eworifjeovivoiej", // TODO: change these
       nonce: "forewijf43oirjoifj",
       login_hint: ""
     }