Merge pull request #192 from authorizerdev/feat/apple-login

feat: add apple login

app/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@authorizerdev/authorizer-react": "^0.24.0-beta.2",
+        "@authorizerdev/authorizer-react": "^0.24.0",
         "@types/react": "^17.0.15",
         "@types/react-dom": "^17.0.9",
         "esbuild": "^0.12.17",
@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@authorizerdev/authorizer-js": {
-      "version": "0.13.0-beta.2",
+      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-0.13.0-beta.2.tgz",
+      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-0.13.1.tgz",
-      "integrity": "sha512-3K3Qew/npD375DQdJnYb43aWVOU7giG2+8sHOjy8aXhZ+GlQQ8cGu54lozFYUMDcM1HjQU2N53xLmneONPepSw==",
+      "integrity": "sha512-VdidQjFQRf3W0Jl3cnJKv2oG/a5rlXFoKmMJQsHjInUvb512VBxSl9GetZ4bEh5gU4BF3Be42x1VVqfv52aXHA==",
       "dependencies": {
         "node-fetch": "^2.6.1"
       },
@@ -37,11 +37,11 @@
       }
     },
     "node_modules/@authorizerdev/authorizer-react": {
-      "version": "0.24.0-beta.2",
+      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-0.24.0-beta.2.tgz",
+      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-0.24.0.tgz",
-      "integrity": "sha512-YQC7yrOhjSSIhDMzjBxcnV735WfDq5ID993J/Lcm7yMWaHCp2zU58pyzCOl1YgSmU9xZLQA/2rGprQgrSNyYoA==",
+      "integrity": "sha512-QlNH5vaDx6Ic+JwPC/0j0lb5vQokypEcy2kXRndwHTsP9Xm7ggdmyJYxQnx22I4GQ3+qLd0gJWc70JfALZQOMg==",
       "dependencies": {
-        "@authorizerdev/authorizer-js": "^0.13.0-beta.2",
+        "@authorizerdev/authorizer-js": "^0.13.1",
         "final-form": "^4.20.2",
         "react-final-form": "^6.5.3",
         "styled-components": "^5.3.0"
@@ -852,19 +852,19 @@
   },
   "dependencies": {
     "@authorizerdev/authorizer-js": {
-      "version": "0.13.0-beta.2",
+      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-0.13.0-beta.2.tgz",
+      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-js/-/authorizer-js-0.13.1.tgz",
-      "integrity": "sha512-3K3Qew/npD375DQdJnYb43aWVOU7giG2+8sHOjy8aXhZ+GlQQ8cGu54lozFYUMDcM1HjQU2N53xLmneONPepSw==",
+      "integrity": "sha512-VdidQjFQRf3W0Jl3cnJKv2oG/a5rlXFoKmMJQsHjInUvb512VBxSl9GetZ4bEh5gU4BF3Be42x1VVqfv52aXHA==",
       "requires": {
         "node-fetch": "^2.6.1"
       }
     },
     "@authorizerdev/authorizer-react": {
-      "version": "0.24.0-beta.2",
+      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-0.24.0-beta.2.tgz",
+      "resolved": "https://registry.npmjs.org/@authorizerdev/authorizer-react/-/authorizer-react-0.24.0.tgz",
-      "integrity": "sha512-YQC7yrOhjSSIhDMzjBxcnV735WfDq5ID993J/Lcm7yMWaHCp2zU58pyzCOl1YgSmU9xZLQA/2rGprQgrSNyYoA==",
+      "integrity": "sha512-QlNH5vaDx6Ic+JwPC/0j0lb5vQokypEcy2kXRndwHTsP9Xm7ggdmyJYxQnx22I4GQ3+qLd0gJWc70JfALZQOMg==",
       "requires": {
-        "@authorizerdev/authorizer-js": "^0.13.0-beta.2",
+        "@authorizerdev/authorizer-js": "^0.13.1",
         "final-form": "^4.20.2",
         "react-final-form": "^6.5.3",
         "styled-components": "^5.3.0"

app/package.json

@@ -11,7 +11,7 @@
   "author": "Lakhan Samani",
   "license": "ISC",
   "dependencies": {
-    "@authorizerdev/authorizer-react": "^0.24.0-beta.2",
+    "@authorizerdev/authorizer-react": "^0.24.0",
     "@types/react": "^17.0.15",
     "@types/react-dom": "^17.0.9",
     "esbuild": "^0.12.17",

server/handlers/oauth_callback.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -17,7 +18,6 @@ import (
 
 	"github.com/authorizerdev/authorizer/server/constants"
 	"github.com/authorizerdev/authorizer/server/cookie"
-	"github.com/authorizerdev/authorizer/server/crypto"
 	"github.com/authorizerdev/authorizer/server/db"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/memorystore"
@@ -471,14 +471,14 @@ func processAppleUserInfo(code string) (models.User, error) {
 
 	tokenSplit := strings.Split(rawIDToken, ".")
 	claimsData := tokenSplit[1]
-	decodedClaimsData, err := crypto.DecryptB64(claimsData)
+	decodedClaimsData, err := base64.RawURLEncoding.DecodeString(claimsData)
 	if err != nil {
-		log.Debug("Failed to decrypt claims data: ", err)
+		log.Debugf("Failed to decrypt claims %s: %s", claimsData, err.Error())
 		return user, fmt.Errorf("failed to decrypt claims data: %s", err.Error())
 	}
 
 	claims := make(map[string]interface{})
-	err = json.Unmarshal([]byte(decodedClaimsData), &claims)
+	err = json.Unmarshal(decodedClaimsData, &claims)
 	if err != nil {
 		log.Debug("Failed to unmarshal claims data: ", err)
 		return user, fmt.Errorf("failed to unmarshal claims data: %s", err.Error())