@zodic/shared 0.0.103 → 0.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {

package/utils/index.ts

@@ -1,5 +1,4 @@
 import { jwtVerify } from 'jose';
-import { webcrypto } from 'node:crypto';
 import { AuthCtx, Gender, JWKS, VALID_GENDERS_ARRAY } from '../types';
 
 export const verifyToken = async (
@@ -10,6 +9,12 @@ export const verifyToken = async (
   const audience = c.env.GOOGLE_OAUTH_CLIENT_ID;
   const issuer = 'https://accounts.google.com';
 
+  console.log('🔍 Verifying JWT...');
+  console.log('🔹 Received Token:', token);
+  console.log('🔹 JWT Secret:', jwtSecret ? '✅ Exists' : '❌ Missing');
+  console.log('🔹 Audience:', audience);
+  console.log('🔹 Issuer:', issuer);
+
   if (!jwtSecret) throw new Error('JWT Secret is not defined in the environment');
 
   try {
@@ -18,19 +23,27 @@ export const verifyToken = async (
       Buffer.from(token.split('.')[0], 'base64').toString('utf8')
     );
 
+    console.log('🔍 Decoded JWT Header:', decodedHeader);
+
     if (decodedHeader.alg.startsWith('RS')) {
-      // 🔹 Google OAuth Token Detected → Verify with Google Public Keys
+      console.log('🔹 Google OAuth Token Detected');
+
+      // 🔹 Verify with Google Public Keys
       const kid = decodedHeader.kid;
+      console.log('🔹 Extracted Key ID (kid):', kid);
 
       const googleKeysResponse = await fetch(
         'https://www.googleapis.com/oauth2/v3/certs'
       );
       const googleKeys = (await googleKeysResponse.json()) as JWKS;
+      console.log('🔍 Fetched Google Public Keys:', googleKeys);
+
+      const key = googleKeys.keys.find((k) => k.kid === kid);
+      if (!key) throw new Error('❌ Google public key not found');
 
-      const key = googleKeys.keys.find((k: any) => k.kid === kid);
-      if (!key) throw new Error('Google public key not found');
+      console.log('🔹 Matching Google Key Found:', key);
 
-      const publicKey = await webcrypto.subtle.importKey(
+      const publicKey = await crypto.subtle.importKey(
         'jwk',
         key,
         { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256' },
@@ -38,20 +51,26 @@ export const verifyToken = async (
         ['verify']
       );
 
+      console.log('🔍 Imported Google Public Key');
+
       const { payload } = await jwtVerify(token, publicKey, {
         audience,
         issuer,
       });
 
+      console.log('✅ Google JWT Verified! Payload:', payload);
+
       if (!payload.sub) {
-        throw new Error('Google token is missing required "sub" claim');
+        throw new Error('❌ Google token is missing required "sub" claim');
       }
 
       return {
         userId: payload.sub, // Google User ID
-        email: payload.email as string || undefined, // Email might be missing, so fallback to undefined
+        email: payload.email as string || undefined, // Email might be missing
       };
     } else {
+      console.log('🔹 Regular JWT Token Detected');
+
       // 🔹 Regular User Token → Verify with JWT_SECRET
       const secret = new TextEncoder().encode(jwtSecret);
       const { payload } = await jwtVerify(token, secret, {
@@ -59,47 +78,20 @@ export const verifyToken = async (
         issuer: c.env.ISSUER,
       });
 
+      console.log('✅ Regular JWT Verified! Payload:', payload);
+
       if (!payload.userId) {
-        throw new Error('JWT is missing required claims (userId)');
+        throw new Error('❌ JWT is missing required claims (userId)');
       }
 
       if (payload.exp && payload.exp * 1000 < Date.now()) {
-        throw new Error('Token has expired');
+        throw new Error('❌ Token has expired');
       }
 
       return payload as { userId: string; email?: string; roles?: string[] };
     }
-  } catch (err) {
+  } catch (err: any) {
+    console.error('❌ Token Verification Failed:', err.message);
     throw new Error('Invalid or expired token');
   }
-};
-
-export const providers = (c: AuthCtx) => ({
-  google: {
-    serverUrl: 'https://accounts.google.com',
-    clientId: c.env.GOOGLE_OAUTH_CLIENT_ID,
-    clientSecret: c.env.GOOGLE_OAUTH_CLIENT_SECRET,
-    resourceUrl: 'https://www.googleapis.com/oauth2/v2/userinfo',
-  },
-  facebook: {
-    serverUrl: 'https://www.facebook.com/v11.0/dialog/oauth',
-    clientId: c.env.FACEBOOK_OAUTH_CLIENT_ID,
-    clientSecret: c.env.FACEBOOK_OAUTH_CLIENT_SECRET,
-    resourceUrl: 'https://graph.facebook.com/me?fields=id,name,email,picture',
-  },
-});
-
-export const GENDER_CODE_MAP: Record<string, Gender> =
-  VALID_GENDERS_ARRAY.reduce((map, gender) => {
-    const key = gender[0];
-    map[key] = gender;
-    return map;
-  }, {} as Record<string, Gender>);
-
-export function createEmptyGenderPrompts(): Record<Gender, string> {
-  const emptyPrompts: Record<Gender, string> = {} as Record<Gender, string>;
-  Object.values(GENDER_CODE_MAP).forEach((gender) => {
-    emptyPrompts[gender] = '';
-  });
-  return emptyPrompts;
-}
+};