chore: update app

app/package.json

@@ -1,29 +1,29 @@
 {
-	"name": "app",
-	"version": "1.0.0",
-	"description": "",
-	"main": "index.js",
-	"scripts": {
-		"build": "rm -rf build && NODE_ENV=production node ./esbuild.config.js",
-		"start": "NODE_ENV=development node ./esbuild.config.js"
-	},
-	"keywords": [],
-	"author": "Lakhan Samani",
-	"license": "ISC",
-	"dependencies": {
-		"@authorizerdev/authorizer-react": "^0.24.0-beta.1",
-		"@types/react": "^17.0.15",
-		"@types/react-dom": "^17.0.9",
-		"esbuild": "^0.12.17",
-		"react": "^17.0.2",
-		"react-dom": "^17.0.2",
-		"react-is": "^17.0.2",
-		"react-router-dom": "^5.2.0",
-		"typescript": "^4.3.5",
-		"styled-components": "^5.3.0"
-	},
-	"devDependencies": {
-		"@types/react-router-dom": "^5.1.8",
-		"@types/styled-components": "^5.1.11"
-	}
+  "name": "app",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "build": "rm -rf build && NODE_ENV=production node ./esbuild.config.js",
+    "start": "NODE_ENV=development node ./esbuild.config.js"
+  },
+  "keywords": [],
+  "author": "Lakhan Samani",
+  "license": "ISC",
+  "dependencies": {
+    "@authorizerdev/authorizer-react": "^0.24.0-beta.2",
+    "@types/react": "^17.0.15",
+    "@types/react-dom": "^17.0.9",
+    "esbuild": "^0.12.17",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-is": "^17.0.2",
+    "react-router-dom": "^5.2.0",
+    "typescript": "^4.3.5",
+    "styled-components": "^5.3.0"
+  },
+  "devDependencies": {
+    "@types/react-router-dom": "^5.1.8",
+    "@types/styled-components": "^5.1.11"
+  }
 }

server/handlers/oauth_callback.go

@@ -225,7 +225,7 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			redirectURL = redirectURL + "?" + strings.TrimPrefix(params, "&")
 		}
 
-		c.Redirect(http.StatusTemporaryRedirect, redirectURL)
+		c.Redirect(http.StatusFound, redirectURL)
 	}
 }
 
@@ -462,8 +462,6 @@ func processAppleUserInfo(code string) (models.User, error) {
 		return user, fmt.Errorf("invalid apple exchange code: %s", err.Error())
 	}
 
-	fmt.Println("=> token", oauth2Token.AccessToken)
-
 	// Extract the ID Token from OAuth2 token.
 	rawIDToken, ok := oauth2Token.Extra("id_token").(string)
 	if !ok {
@@ -471,8 +469,6 @@ func processAppleUserInfo(code string) (models.User, error) {
 		return user, fmt.Errorf("unable to extract id_token")
 	}
 
-	fmt.Println("=> rawIDToken", rawIDToken)
-
 	tokenSplit := strings.Split(rawIDToken, ".")
 	claimsData := tokenSplit[1]
 	decodedClaimsData, err := crypto.DecryptB64(claimsData)
@@ -480,7 +476,6 @@ func processAppleUserInfo(code string) (models.User, error) {
 		log.Debug("Failed to decrypt claims data: ", err)
 		return user, fmt.Errorf("failed to decrypt claims data: %s", err.Error())
 	}
-	fmt.Println("=> decoded claims data", decodedClaimsData)
 
 	claims := make(map[string]interface{})
 	err = json.Unmarshal([]byte(decodedClaimsData), &claims)
@@ -489,21 +484,24 @@ func processAppleUserInfo(code string) (models.User, error) {
 		return user, fmt.Errorf("failed to unmarshal claims data: %s", err.Error())
 	}
 
-	fmt.Println("=> claims", claims)
-
 	if val, ok := claims["email"]; !ok {
-		log.Debug("Failed to extract email from claims")
-		return user, fmt.Errorf("unable to extract email")
+		log.Debug("Failed to extract email from claims.")
+		return user, fmt.Errorf("unable to extract email, please check the scopes enabled for your app. It needs `email`, `name` scopes")
 	} else {
 		user.Email = val.(string)
 	}
 
 	if val, ok := claims["name"]; ok {
 		nameData := val.(map[string]interface{})
-		givenName := nameData["firstName"].(string)
-		familyName := nameData["lastName"].(string)
-		user.GivenName = &givenName
-		user.FamilyName = &familyName
+		if nameVal, ok := nameData["firstName"]; ok {
+			givenName := nameVal.(string)
+			user.GivenName = &givenName
+		}
+
+		if nameVal, ok := nameData["lastName"]; ok {
+			familyName := nameVal.(string)
+			user.FamilyName = &familyName
+		}
 	}
 
 	return user, err

server/handlers/oauth_login.go

@@ -184,7 +184,9 @@ func OAuthLoginHandler() gin.HandlerFunc {
 				return
 			}
 			oauth.OAuthProviders.AppleConfig.RedirectURL = hostname + "/oauth_callback/" + constants.SignupMethodApple
-			url := oauth.OAuthProviders.AppleConfig.AuthCodeURL(oauthStateString, oauth2.SetAuthURLParam("response_mode", "form_post"))
+			// there is scope encoding issue with oauth2 and how apple expects, hence added scope manually
+			// check: https://github.com/golang/oauth2/issues/449
+			url := oauth.OAuthProviders.AppleConfig.AuthCodeURL(oauthStateString, oauth2.SetAuthURLParam("response_mode", "form_post")) + "&scope=name email"
 			c.Redirect(http.StatusTemporaryRedirect, url)
 		default:
 			log.Debug("Invalid oauth provider: ", provider)

server/oauth/oauth.go

@@ -130,7 +130,6 @@ func InitOAuth() error {
 				AuthURL:  "https://appleid.apple.com/auth/authorize",
 				TokenURL: "https://appleid.apple.com/auth/token",
 			},
-			Scopes: []string{"openid", "name", "email"},
 		}
 	}