From 367ca6615c18fbd1aea19cac1f0757b0d1d8ad6e Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Fri, 3 May 2024 01:03:08 +0300
Subject: [PATCH] appleID: try dynamic secret

---
 .env                            |  6 ++++--
 pages/api/auth/[...nextauth].ts | 23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 52016e2..f86855c 100644
--- a/.env
+++ b/.env
@@ -24,6 +24,9 @@ AZURE_AD_TENANT_ID=f69d1a93-bfba-498a-9b60-e87c1bc26276
 
 APPLE_TEAM_ID=XC57P9SXDK
 APPLE_KEY_ID=TB3V355G5Y
+APPLE_APP_ID=com.mwhitnessing.sofia
+APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IjlRVzkyNkZTSzkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxNDY3MDQxOSwiZXhwIjoxNzMwMjIyNDIwLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.KUW2roM2MAyfe2RphAoeAB-OK4LolGcO347SCxIocM3RXR0Z_5GVwu0BJiHwh2nO4WGXi2xHJgBvuwZhdAPWug
+APPLE_PK=-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgLJtuaml9xsCzcKSH\nRvaTqmxoQgPzxXtk9jWZGU90FQCgCgYIKoZIzj0DAQehRANCAATM910/AhLshLvn\nWbmWi7F580AqLoNvHKHB4A1bccz+9QSvj0AcYA4J0BiMFfQrhXC5/SKEe7I0pDcv\nn4UlL3Sx\n-----END PRIVATE KEY-----
 
 # APPLE_APP_ID=com.mwhitnessing.sofia
 # APPLE_SECRET=eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJpYXQiOjE3MTMzMDQ1OTMsImV4cCI6MTcyODg1NjU5MywiYXVkIjoiaHR0cHM6Ly9hcHBsZWlkLmFwcGxlLmNvbSIsImlzcyI6IlhDNTdQOVNYREsiLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.iO2prjQ_4P7F17R7LTJfG9zHluj59uUtm8DA1LbK49jVBMeGHQP_Az7s_yU5D-GeMHSwU7VnVHcaVKiGWT_Yjg
@@ -32,8 +35,7 @@ APPLE_KEY_ID=TB3V355G5Y
 #APPLE_APP_ID=XC57P9SXDK.com.mwhitnessing.sofia
 #APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
 # to generate
-APPLE_APP_ID=com.mwhitnessing.sofia
-APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IjlRVzkyNkZTSzkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxNDY3MDQxOSwiZXhwIjoxNzMwMjIyNDIwLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.KUW2roM2MAyfe2RphAoeAB-OK4LolGcO347SCxIocM3RXR0Z_5GVwu0BJiHwh2nO4WGXi2xHJgBvuwZhdAPWug
+
 
 
 
diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts
index faf0f3c..cb0edee 100644
--- a/pages/api/auth/[...nextauth].ts
+++ b/pages/api/auth/[...nextauth].ts
@@ -46,8 +46,15 @@ export const authOptions: NextAuthOptions = {
       }
     }),
     AppleProvider({
+      // clientId: process.env.APPLE_APP_ID,
+      // clientSecret: process.env.APPLE_SECRET
       clientId: process.env.APPLE_APP_ID,
-      clientSecret: process.env.APPLE_SECRET
+      clientSecret: {
+        appleId: process.env.APPLE_APP_ID,
+        teamId: process.env.APPLE_TEAM_ID,
+        privateKey: process.env.APPLE_PK,
+        keyId: process.env.APPLE_KEY_ID,
+      }
     }),
     // AzureADProvider({
     //   clientId: process.env.AZURE_AD_CLIENT_ID,
@@ -251,13 +258,13 @@ export const authOptions: NextAuthOptions = {
       };
     },
   },
-  pages: {
-    signIn: "/auth/signin",
-    signOut: "/auth/signout",
-    error: "/message", // Error code passed in query string as ?error=
-    verifyRequest: "/auth/verify-request", // (used for check email message)
-    newUser: null // If set, new users will be directed here on first sign in
-  },
+  //   pages: {
+  //     signIn: "/auth/signin",
+  //     signOut: "/auth/signout",
+  //     error: "/message", // Error code passed in query string as ?error=
+  //     verifyRequest: "/auth/verify-request", // (used for check email message)
+  //     newUser: null // If set, new users will be directed here on first sign in
+  //   },
 }
 
 export default NextAuth(authOptions)
\ No newline at end of file