[#219] Sign in with Apple이 실패하는 현상을 해결한다 (#220)

* style: 인덴트 수정

* fix: 애플 관련 키 못찾는 현상 해결

* refactor: 어떤 키가 누락되었는지 더 로그를 자세히 띄우도록 개선

Author: opficdev

DevLog/Infra/Service/SocialLogin/AppleAuthenticationService.swift

@@ -44,39 +44,39 @@ final class AppleAuthenticationService: AuthenticationService {
             logger.debug("Signing in with custom token")
             let result = try await Auth.auth().signIn(withCustomToken: customToken)
 
-        let changeRequest = result.user.createProfileChangeRequest()
-        var displayName: String?
-
-        // 최초 사용자 가입 시 사용자 이름 설정
-        if let fullName = credential.fullName {
-            let formatter = PersonNameComponentsFormatter()
-            formatter.style = .long
-            let formattedName = formatter.string(from: fullName)
-            if !formattedName.isEmpty {
-                displayName = formattedName
+            let changeRequest = result.user.createProfileChangeRequest()
+            var displayName: String?
+
+            // 최초 사용자 가입 시 사용자 이름 설정
+            if let fullName = credential.fullName {
+                let formatter = PersonNameComponentsFormatter()
+                formatter.style = .long
+                let formattedName = formatter.string(from: fullName)
+                if !formattedName.isEmpty {
+                    displayName = formattedName
+                }
             }
-        }
 
-        // 이미 가입된 사용자일 경우 Firestore에서 사용자 이름 가져오기
-        if displayName == nil {
-            let doc = try await store.document("users/\(result.user.uid)/userData/info").getDocument()
-            displayName = doc.data()?["appleName"] as? String
-        }
+            // 이미 가입된 사용자일 경우 Firestore에서 사용자 이름 가져오기
+            if displayName == nil {
+                let doc = try await store.document("users/\(result.user.uid)/userData/info").getDocument()
+                displayName = doc.data()?["appleName"] as? String
+            }
 
-        // FirebaseAuth 사용자 프로필 업데이트
-        changeRequest.displayName = displayName ?? ""
-        changeRequest.photoURL = nil    //  Apple ID 프로필 사진 URL은 제공되지 않음
-        try await changeRequest.commitChanges()
+            // FirebaseAuth 사용자 프로필 업데이트
+            changeRequest.displayName = displayName ?? ""
+            changeRequest.photoURL = nil    //  Apple ID 프로필 사진 URL은 제공되지 않음
+            try await changeRequest.commitChanges()
 
-        // FirebaseAuth 계정에 Apple ID 연결
-        if !result.user.providerData.contains(where: { $0.providerID == providerID.rawValue }) {
-            let appleCredential = OAuthProvider.credential(
-                providerID: providerID,
-                idToken: idTokenString,
-                rawNonce: nonce
-            )
-            try await result.user.link(with: appleCredential)
-        }
+            // FirebaseAuth 계정에 Apple ID 연결
+            if !result.user.providerData.contains(where: { $0.providerID == providerID.rawValue }) {
+                let appleCredential = OAuthProvider.credential(
+                    providerID: providerID,
+                    idToken: idTokenString,
+                    rawNonce: nonce
+                )
+                try await result.user.link(with: appleCredential)
+            }
 
             let fcmToken = try await messaging.token()
 

Firebase/functions/src/auth/apple.ts

@@ -19,11 +19,38 @@ interface AppleTokenPayload {
   auth_time?: number;   // 인증 시간
 }
 
-// Apple 설정 불러오기
-const teamId = process.env.APPLE_TEAM_ID;
-const clientId = process.env.APPLE_CLIENT_ID;
-const keyId = process.env.APPLE_KEY_ID;
-const privateKey = (process.env.APPLE_PRIVATE_KEY || "").replace(/\\n/g, "\n");
+function getAppleConfiguration() {
+    const teamId = process.env.APPLE_TEAM_ID;
+    const clientId = process.env.APPLE_CLIENT_ID;
+    const keyId = process.env.APPLE_KEY_ID;
+    const privateKey = (process.env.APPLE_PRIVATE_KEY || "").replace(/\\n/g, "\n");
+    const configs = {
+        APPLE_TEAM_ID: teamId,
+        APPLE_CLIENT_ID: clientId,
+        APPLE_KEY_ID: keyId,
+        APPLE_PRIVATE_KEY: privateKey
+    };
+    const missingKeys = Object.entries(configs)
+        .filter(([, value]) => !value)
+        .map(([key]) => key);
+
+    if (0 < missingKeys.length) {
+        console.error("Missing Apple configuration", {
+            missingKeys
+        });
+        throw new HttpsError(
+            'internal',
+            `Missing Apple configuration for: ${missingKeys.join(", ")}`
+        );
+    }
+
+    return {
+        teamId: teamId!,
+        clientId: clientId!,
+        keyId: keyId!,
+        privateKey: privateKey!
+    };
+}
 
 export const requestAppleCustomToken = onCall({
     cors: true,
@@ -37,11 +64,6 @@ export const requestAppleCustomToken = onCall({
             throw new HttpsError('invalid-argument', 'ID token and authorization code are required');
         }
 
-        // Apple 설정 불러오기
-        if (!teamId || !clientId || !keyId || !privateKey) {
-            throw new HttpsError('internal', 'Missing Apple configuration');
-        }
-
         // // 1. Verify and decode the Apple ID token
         let decodedToken: AppleTokenPayload;
         try {
@@ -143,10 +165,6 @@ export const requestAppleRefreshToken = onCall({
       if (!authorizationCode || !uid) {
         throw new HttpsError("invalid-argument", "Authorization code and uid are required");
       }
-  
-      if (!teamId || !clientId || !keyId || !privateKey) {
-        throw new HttpsError("internal", "Missing Apple configuration");
-      }
 
       const refreshToken = await requestAppleRefreshTokenHelper(authorizationCode);
       console.log("appleRefreshToken:", refreshToken);
@@ -197,13 +215,7 @@ export const refreshAppleAccessToken = onCall({
     }
 
     console.log("Successfully retrieved refresh token from Firestore");
-    
-    if (!teamId || !clientId || !keyId || !privateKey) {
-        throw new HttpsError(
-                             "internal",
-                             "Missing Apple configuration environment variables."
-        );
-    }
+    const { teamId, clientId, keyId, privateKey } = getAppleConfiguration();
 
     // Create client_secret JWT
     const clientSecret = jwt.sign({}, privateKey, {
@@ -265,15 +277,12 @@ export const revokeAppleAccessToken = onCall({
 
     try {
         const { token } = request.data;
+        const { teamId, clientId, keyId, privateKey } = getAppleConfiguration();
 
         if (!token) {
             throw new HttpsError("invalid-argument", "Token is required");
         }
 
-        if (!teamId || !clientId || !keyId || !privateKey) {
-            throw new HttpsError("internal", "Missing Apple configuration");
-        }
-
             // JWT 생성
         const clientSecret = jwt.sign({}, privateKey, {
             algorithm: "ES256",
@@ -323,10 +332,7 @@ export const revokeAppleAccessToken = onCall({
 });
 
 export async function requestAppleRefreshTokenHelper(authorizationCode: string): Promise<string> {
-    // Apple 설정 불러오기
-    if (!teamId || !clientId || !keyId || !privateKey) {
-        throw new HttpsError('internal', 'Missing Apple configuration');
-    }
+    const { teamId, clientId, keyId, privateKey } = getAppleConfiguration();
 
     // JWT 생성
     const clientSecret = jwt.sign({}, privateKey, {