@zodic/shared 0.0.133 → 0.0.135

package/app/api/astrology/index.ts

@@ -1,36 +1,93 @@
 import { BackendBindings } from '../../../types';
 
-export async function makeAstrologyApiCall(
-  path: string,
-  payload: any,
-  env: BackendBindings,
-  language: string
-) {
-  const shortLanguage = language.slice(0, 2); // Extracts only "en" or "pt"
+// export async function makeAstrologyApiCall(
+//   path: string,
+//   payload: any,
+//   env: BackendBindings,
+//   language: string
+// ) {
+//   const shortLanguage = language.slice(0, 2); // Extracts only "en" or "pt"
+
+//   const endpoint = `https://astrologyapi.com/api/${path}`;
+//   const headers = {
+//     Authorization: `Bearer ${env.ASTROLOGY_WESTERN_API_KEY}`,
+//     'Content-Type': 'application/json',
+//     'Accept-Language': shortLanguage, // Sends "en" or "pt"
+//   };
 
-  const endpoint = `https://astrologyapi.com/api/${path}`;
-  const headers = {
-    Authorization: `Bearer ${env.ASTROLOGY_WESTERN_API_KEY}`,
-    'Content-Type': 'application/json',
-    'Accept-Language': shortLanguage, // Sends "en" or "pt"
-  };
+//   try {
+//     const response = await fetch(endpoint, {
+//       method: 'POST',
+//       headers,
+//       body: JSON.stringify(payload),
+//     });
 
+//     if (!response.ok) {
+//       const error = await response.json();
+//       console.error('Astrology API Error:', error);
+//       throw new Error(`Astrology API Error: ${response.status}`);
+//     }
+
+//     return await response.json();
+//   } catch (err: any) {
+//     console.error('Error calling Astrology API:', err.message);
+//     throw err;
+//   }
+// }
+
+export const makeAstrologyApiCall = async (
+  path: string,
+  payload: Record<string, any>,
+  env: BackendBindings,
+  language: 'en-us' | 'pt-br'
+) => {
+  const shortLanguage = language.slice(0, 2);
   try {
-    const response = await fetch(endpoint, {
+    const url = `https://astrologyapi.com/api/${path}`;
+    console.log(`🌍 Making Astrology API Call: ${url}`);
+
+    const response = await fetch(url, {
       method: 'POST',
-      headers,
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept-Language': shortLanguage,
+        Authorization: `Bearer ${env.ASTROLOGY_WESTERN_API_KEY}`,
+      },
       body: JSON.stringify(payload),
     });
 
+    // ✅ Log response status
+    console.log(`🔄 Response Status (${path}):`, response.status);
+
+    // ✅ Handle non-OK responses gracefully
     if (!response.ok) {
-      const error = await response.json();
-      console.error('Astrology API Error:', error);
-      throw new Error(`Astrology API Error: ${response.status}`);
+      console.error(
+        `❌ API Error (${path}):`,
+        response.status,
+        await response.text()
+      );
+      throw new Error(`Failed to fetch astrology data from ${path}`);
     }
 
-    return await response.json();
-  } catch (err: any) {
-    console.error('Error calling Astrology API:', err.message);
-    throw err;
+    // ✅ Check if response body is empty
+    const text = await response.text();
+    if (!text) {
+      console.error(`❌ API Response Empty (${path})`);
+      throw new Error(`Empty response from ${path}`);
+    }
+
+    // ✅ Try parsing JSON
+    try {
+      return JSON.parse(text);
+    } catch (jsonError) {
+      console.error(`❌ JSON Parse Error (${path}):`, jsonError);
+      throw new Error(`Invalid JSON response from ${path}`);
+    }
+  } catch (error) {
+    console.error(
+      `❌ Astrology API Call Failed (${path}):`,
+      (error as Error).message
+    );
+    throw error;
   }
-}
+};

package/package.json

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

package/utils/index.ts

@@ -101,17 +101,17 @@ export const verifyToken = async (
   }
 };
 
-export const providers: (c: AuthCtx) => Record<Provider, ProviderInfo> = () => ({
+export const providers: (c: AuthCtx) => Record<Provider, ProviderInfo> = (c) => ({
   google: {
     serverUrl: 'https://accounts.google.com/.well-known/openid-configuration', // ✅ Correct Discovery URL
-    clientId: process.env.GOOGLE_OAUTH_CLIENT_ID!,
-    clientSecret: process.env.GOOGLE_OAUTH_CLIENT_SECRET!,
+    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/.well-known/openid-configuration', // ✅ Facebook equivalent
-    clientId: process.env.FACEBOOK_OAUTH_CLIENT_ID!,
-    clientSecret: process.env.FACEBOOK_OAUTH_CLIENT_SECRET!,
+    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',
   },
 });
@@ -119,3 +119,4 @@ export const providers: (c: AuthCtx) => Record<Provider, ProviderInfo> = () => (
 export function normalizeName(name: string): string {
   return name.toLowerCase().replace(/\s+/g, '-');
 }
+