slek-ai-cli 1.1.6 → 1.1.7

package/auth.js

@@ -10,22 +10,9 @@ const axios        = require('axios');
 const chalk        = require('chalk');
 const boxen        = require('boxen');
 
-// ─── Firebase / Google config (hardcoded — safe for CLI tools) ────────────────
-// FIREBASE_API_KEY and GOOGLE_CLIENT_ID are public-safe values.
-// We use Firebase's signInWithIdp flow, so GOOGLE_CLIENT_SECRET is NOT needed.
-const FIREBASE_API_KEY = 'AIzaSyBoQHn_adTTj1ZaYZBMHCMSAblCGCIbQG4';
-const GOOGLE_CLIENT_ID = 'YOUR_GOOGLE_CLIENT_ID';   // e.g. 123456.apps.googleusercontent.com
-
-// Additional Firebase config (for future SDK use if needed)
-const FIREBASE_CONFIG = {
-  apiKey:            'AIzaSyBoQHn_adTTj1ZaYZBMHCMSAblCGCIbQG4',
-  authDomain:        'charm-f004f.firebaseapp.com',
-  projectId:         'charm-f004f',
-  storageBucket:     'charm-f004f.firebasestorage.app',
-  messagingSenderId: '763614479011',
-  appId:             '1:763614479011:web:5cd0082b14b78b9c5eb516',
-  measurementId:     'G-0G0F5DT6PC',
-};
+// ─── Firebase config (hardcoded — all values from Firebase Console) ───────────
+const FIREBASE_API_KEY  = 'AIzaSyBoQHn_adTTj1ZaYZBMHCMSAblCGCIbQG4';
+const FIREBASE_AUTH_DOMAIN = 'charm-f004f.firebaseapp.com';
 
 const REDIRECT_URI = 'http://localhost:9876/callback';
 const AUTH_PORT    = 9876;
@@ -65,7 +52,7 @@ function getUser() {
   return loadToken();
 }
 
-// ─── Open browser cross-platform ──────────────────────────────────────────────
+// ─── Open browser cross-platform ─────────────────────────────────────────────
 function openBrowser(targetUrl) {
   try {
     const platform = process.platform;
@@ -83,73 +70,72 @@ function openBrowser(targetUrl) {
   }
 }
 
-// ─── Exchange Google auth code → Firebase ID token ────────────────────────────
-// Uses Firebase's signInWithIdp endpoint — no CLIENT_SECRET required.
-async function exchangeCodeForToken(code) {
-  // Step 1: Exchange code for Google ID token using Google's token endpoint.
-  // We use PKCE / implicit flow via Firebase — client secret not needed here.
-  // Instead, we use Firebase's direct Google OAuth token exchange.
-  const tokenRes = await axios.post(
-    'https://oauth2.googleapis.com/token',
-    new URLSearchParams({
-      code,
-      client_id:    GOOGLE_CLIENT_ID,
-      redirect_uri: REDIRECT_URI,
-      grant_type:   'authorization_code',
-    }),
-    { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }
-  );
+// ─── Firebase Google Sign-In URL ──────────────────────────────────────────────
+// Uses Firebase's own OAuth redirect — no separate Google Client ID needed.
+function buildFirebaseAuthUrl() {
+  const base = `https://${FIREBASE_AUTH_DOMAIN}/__/auth/handler`;
+  const params = new URLSearchParams({
+    apiKey:      FIREBASE_API_KEY,
+    appName:     '[DEFAULT]',
+    authType:    'signInViaRedirect',
+    redirectUrl: REDIRECT_URI,
+    providerId:  'google.com',
+    scopes:      'profile,email',
+    v:           '10',
+  });
+  return `${base}?${params.toString()}`;
+}
 
-  const { id_token } = tokenRes.data;
+// ─── Exchange Firebase redirect token ────────────────────────────────────────
+// After Firebase redirect, we get an id_token in the callback URL fragment/query.
+async function handleFirebaseCallback(queryParams) {
+  // Firebase returns id_token directly in the callback
+  const idToken = queryParams.id_token || queryParams.idToken;
+
+  if (idToken) {
+    // Verify and get user info from Firebase
+    const res = await axios.post(
+      `https://identitytoolkit.googleapis.com/v1/accounts:lookup?key=${FIREBASE_API_KEY}`,
+      { idToken }
+    );
+    const user = res.data.users?.[0];
+    if (!user) throw new Error('User not found');
+    return {
+      name:      user.displayName || user.email,
+      email:     user.email,
+      photo:     user.photoUrl || '',
+      idToken,
+      expiresAt: Date.now() + 3600 * 1000, // 1 hour
+    };
+  }
+
+  // Fallback: if Firebase sends an auth code instead
+  const code = queryParams.code;
+  if (!code) throw new Error('No token or code received from Firebase');
 
-  // Step 2: Sign in to Firebase using the Google ID token.
   const firebaseRes = await axios.post(
     `https://identitytoolkit.googleapis.com/v1/accounts:signInWithIdp?key=${FIREBASE_API_KEY}`,
     {
-      postBody:            `id_token=${id_token}&providerId=google.com`,
+      postBody:            `id_token=${code}&providerId=google.com`,
       requestUri:          REDIRECT_URI,
       returnIdpCredential: true,
       returnSecureToken:   true,
     }
   );
 
-  const { displayName, email, idToken, expiresIn, photoUrl } = firebaseRes.data;
-
+  const { displayName, email, idToken: token, expiresIn, photoUrl } = firebaseRes.data;
   return {
     name:      displayName,
     email,
-    photo:     photoUrl,
-    idToken,
+    photo:     photoUrl || '',
+    idToken:   token,
     expiresAt: Date.now() + parseInt(expiresIn) * 1000,
   };
 }
 
 // ─── Login ────────────────────────────────────────────────────────────────────
 async function login() {
-  // Validate config is filled in
-  if (
-    !GOOGLE_CLIENT_ID || GOOGLE_CLIENT_ID === 'YOUR_GOOGLE_CLIENT_ID'
-  ) {
-    console.log(
-      boxen(
-        chalk.red('✗ Google Client ID not set!\n\n') +
-        chalk.white('Open ') + chalk.yellow('auth.js') + chalk.white(' and replace:\n\n') +
-        chalk.cyan('YOUR_GOOGLE_CLIENT_ID') +
-        chalk.white('\n\nwith your OAuth Client ID from Google Cloud Console.'),
-        { padding: 1, margin: { left: 2 }, borderStyle: 'round', borderColor: 'red' }
-      )
-    );
-    process.exit(1);
-  }
-
-  // Build Google OAuth URL
-  const authUrl = new URL('https://accounts.google.com/o/oauth2/v2/auth');
-  authUrl.searchParams.set('client_id',     GOOGLE_CLIENT_ID);
-  authUrl.searchParams.set('redirect_uri',  REDIRECT_URI);
-  authUrl.searchParams.set('response_type', 'code');
-  authUrl.searchParams.set('scope',         'openid email profile');
-  authUrl.searchParams.set('access_type',   'offline');
-  authUrl.searchParams.set('prompt',        'select_account');
+  const authUrl = buildFirebaseAuthUrl();
 
   return new Promise((resolve, reject) => {
     const server = http.createServer(async (req, res) => {
@@ -162,26 +148,17 @@ async function login() {
         return;
       }
 
-      const code  = parsed.query.code;
-      const error = parsed.query.error;
-
       // Send success page to browser immediately
       res.writeHead(200, { 'Content-Type': 'text/html' });
       res.end(`
         <html>
           <body style="
-            background: #0a0a0a;
-            color: #fff;
-            font-family: monospace;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            height: 100vh;
-            margin: 0;
-          ">
-            <div style="text-align: center;">
-              <h1 style="color: #76b900;">✓ Login Successful!</h1>
-              <p style="color: #aaa;">You can close this tab and return to the terminal.</p>
+            background:#0a0a0a;color:#fff;font-family:monospace;
+            display:flex;align-items:center;justify-content:center;
+            height:100vh;margin:0;">
+            <div style="text-align:center;">
+              <h1 style="color:#76b900;">✓ Login Successful!</h1>
+              <p style="color:#aaa;">You can close this tab and return to the terminal.</p>
             </div>
           </body>
         </html>
@@ -189,6 +166,7 @@ async function login() {
 
       server.close();
 
+      const error = parsed.query.error;
       if (error) {
         console.log(chalk.red('\n  ✗ Login cancelled.\n'));
         reject(new Error(error));
@@ -197,7 +175,7 @@ async function login() {
 
       try {
         process.stdout.write(chalk.cyan('\n  ⏳ Verifying with Firebase...\n'));
-        const userData = await exchangeCodeForToken(code);
+        const userData = await handleFirebaseCallback(parsed.query);
         saveToken(userData);
 
         console.log(
@@ -235,12 +213,10 @@ async function login() {
           { padding: 1, margin: { left: 2 }, borderStyle: 'double', borderColor: 'green' }
         )
       );
-
-      // Small delay to ensure server is ready before opening browser
       setTimeout(() => openBrowser(authUrl.toString()), 500);
     });
 
-    // Auto-cancel login after 2 minutes
+    // Auto-cancel after 2 minutes
     setTimeout(() => {
       server.close();
       console.log(chalk.red('\n  ✗ Login timed out (2 min). Please try again.\n'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slek-ai-cli",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "SLEK AI CLI — Powered by NVIDIA API",
   "main": "cli.js",
   "bin": {
@@ -17,6 +17,7 @@
     "figlet": "^1.7.0",
     "gradient-string": "^2.0.2",
     "open": "^8.4.2",
-    "ora": "^5.4.1"
+    "ora": "^5.4.1",
+    "slek-ai-cli": "^1.1.6"
   }
 }