slek-ai-cli 1.1.7 → 1.1.9

package/.env

@@ -0,0 +1,7 @@
+FIREBASE_PROJECT_ID="charm-f004f"
+FIREBASE_CLIENT_EMAIL="firebase-adminsdk-fbsvc@charm-f004f.iam.gserviceaccount.com"
+FIREBASE_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPq0be+jDD2xzZ\nHfWTD3QhZK9/vSZAah4hBN6mozeJMkeY4HF7PH8q6e/14AcLK8NtOiYOGDW0fQNX\nR4khT/DBtkEt+BR6CqGS38u+0ahhua9hw5ea8c6+8Zu9elUWHJ1mdYnt96IGf4Tj\nrJcBe5CKxJb8YvHLd1pUvjDcwxzG46qar0shr2yJJo7z8XyQImwtXjqNd7P9FnfE\nIlBZsMGbSnW+tv/ryCoPAaQJW4A/80qDLctUuKp1nSw3Hm8r/jqPmzBEt72beCxX\nPoR4RSKWZ4Pm8yFZgw2xwU41s7loIhHQeFYN1pE5OaIhZLpGedhgEST51MaIM62I\nrhCDS85VAgMBAAECgf829V0MJapCKvq3evZCtRRGwh6v757v7SWMF33VG9zWsjfA\nfaWKt7fv43ld2KwEiNBvV7Q6hq2v1mXL82KXLlDI8zLMt5qzsZyRAikpltK5Cisf\n9GNq3hOY9NgCjR13fJsrQm/+SkrW7Wh92G8eNVVLZDuRD55t+mgthSfpRLmY6K1G\nGNhwtzwJkNHMh5ZgRFhKHwCjR7s14Lt72TIak2jDn9Fdwn5f5oF/7RoQx5Y5D9sD\ngMlWshdmmi40jjsa8Kvepun0dwmnh3CWjEB3E1DoKWjVKbSaYSryrWKA9uXYiOh3\nPZe7T5pv2OfvoORpsWwI/hOb+2yJ4gv/22b5mvECgYEA81BAAbCgqA121JExnuHP\ndoTO5gdzpc6YoHYAp2cyuyEm1yA+CwamoFglSkiwpq/odnNMo/SfOxgkoIurDtn0\n3J7ARFKOK4pHZkTAvL2jqkuvh1dJc5+NC/i3SgQq8t1df/dkZ//LNycAwPZQDNuv\nV44eG68xdrC9pHY+W5NIVhECgYEA2n8+qLXJJcUt6D2Ij6GmMtjdk8gEjMzHvWC4\nICdPsCyNHEsM2e/sJQOiV+UDEjtoDWZgfe/A5vibMMQQbeHr+3ibgMvjsbvrdVWb\nq1cmjDI94D4mOms71QgH0H+QtF2t4iQWiviudIeLqF0EUpMWsvgO9B/oJUEL6WXt\nt3YgIAUCgYEAxEKEDpjpTgTmSBoB23WrgZ8owJVcLG9T34KvjliIrDbWfIouYXhw\n6T+QfLXbf+i+auUf+dQ0qFcWHEXsqeMXRunqjnHE6cv1QcHNcbDKFnBMWrAGuHQH\nMpPhTJvGBPaYF8N2wwiqY4dbbUqBUY3WhppFIPGUxXdU0Rbrv7QykfECgYEAvVTn\nod+sBkufZQ/1BqkHUCY1kroOn0dPiV2HD22hEsL4H900rKDG2qgUg99RUvohRwNA\nd8BKQpqIN7Cdn+nVx5mR/gAvNLLm7EybUNR69Z8PmQGhtJt5RDbqNpRjerd2Vm/5\nDMFCwn012lWHylnkoH5szsPbMHT18nA9le0JF1UCgYEAlJNW/WqqTETu1JciGn3o\nIeG2jbdcUjHpnd8fKVUNm4yRCtwLsHRQar0/DI1FNUAqpi/wEU9CB5YVjyyTKWQX\nOyidG32VtkB6yTmlLKxnxY2+VxL4Vfk6ka9K/6tcLfFpy+LYgAzEbeRR32kz6upu\nLudPjkoiArV7RQZE/G7ySH4=\n-----END PRIVATE KEY-----\n"
+FIREBASE_API_KEY="AIzaSyBoQHn_adTTj1ZaYZBMHCMSAblCGCIbQG4"
+FIREBASE_AUTH_DOMAIN="charm-f004f.firebaseapp.com"
+GOOGLE_CLIENT_ID="763614479011-v2m44ees6jhjaprj5ndoa0up83gf1qah.apps.googleusercontent.com"
+GOOGLE_CLIENT_SECRET="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"

package/auth.js

@@ -10,9 +10,14 @@ const axios        = require('axios');
 const chalk        = require('chalk');
 const boxen        = require('boxen');
 
-// ─── Firebase config (hardcoded — all values from Firebase Console) ───────────
-const FIREBASE_API_KEY  = 'AIzaSyBoQHn_adTTj1ZaYZBMHCMSAblCGCIbQG4';
-const FIREBASE_AUTH_DOMAIN = 'charm-f004f.firebaseapp.com';
+// Load environment variables from .env
+require('dotenv').config({ path: path.join(__dirname, '.env') });
+
+// ─── Firebase / Google config ────────────────────────────────────────────────
+const FIREBASE_API_KEY  = process.env.FIREBASE_API_KEY || 'AIzaSyBoQHn_adTTj1ZaYZBMHCMSAblCGCIbQG4';
+const FIREBASE_AUTH_DOMAIN = process.env.FIREBASE_AUTH_DOMAIN || 'charm-f004f.firebaseapp.com';
+const GOOGLE_CLIENT_ID = process.env.GOOGLE_CLIENT_ID || '763614479011-v2m44ees6jhjaprj5ndoa0up83gf1qah.apps.googleusercontent.com';
+const GOOGLE_CLIENT_SECRET = process.env.GOOGLE_CLIENT_SECRET || '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';
 
 const REDIRECT_URI = 'http://localhost:9876/callback';
 const AUTH_PORT    = 9876;
@@ -70,72 +75,64 @@ function openBrowser(targetUrl) {
   }
 }
 
-// ─── 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()}`;
+// ─── Google OAuth URL ────────────────────────────────────────────────────────
+function buildGoogleAuthUrl() {
+  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');
+  return authUrl.toString();
 }
 
-// ─── 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
-    };
-  }
+// ─── Exchange Google code to Firebase token ──────────────────────────────────
+async function exchangeCodeForToken(code) {
+  const tokenRes = await axios.post('https://oauth2.googleapis.com/token', {
+    code,
+    client_id:     GOOGLE_CLIENT_ID,
+    client_secret: GOOGLE_CLIENT_SECRET,
+    redirect_uri:  REDIRECT_URI,
+    grant_type:    'authorization_code',
+  });
 
-  // Fallback: if Firebase sends an auth code instead
-  const code = queryParams.code;
-  if (!code) throw new Error('No token or code received from Firebase');
+  const { id_token } = tokenRes.data;
 
   const firebaseRes = await axios.post(
     `https://identitytoolkit.googleapis.com/v1/accounts:signInWithIdp?key=${FIREBASE_API_KEY}`,
     {
-      postBody:            `id_token=${code}&providerId=google.com`,
+      postBody:            `id_token=${id_token}&providerId=google.com`,
       requestUri:          REDIRECT_URI,
       returnIdpCredential: true,
       returnSecureToken:   true,
     }
   );
 
-  const { displayName, email, idToken: token, expiresIn, photoUrl } = firebaseRes.data;
+  const { displayName, email, idToken, expiresIn, photoUrl } = firebaseRes.data;
   return {
     name:      displayName,
     email,
     photo:     photoUrl || '',
-    idToken:   token,
+    idToken,
     expiresAt: Date.now() + parseInt(expiresIn) * 1000,
   };
 }
 
 // ─── Login ────────────────────────────────────────────────────────────────────
 async function login() {
-  const authUrl = buildFirebaseAuthUrl();
+  if (!GOOGLE_CLIENT_ID || !GOOGLE_CLIENT_SECRET) {
+    console.log(
+      boxen(
+        chalk.red('✗ Google OAuth Client configuration missing!\n\n') +
+        chalk.white('Add GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET to .env'),
+        { padding: 1, margin: { left: 2 }, borderStyle: 'round', borderColor: 'red' }
+      )
+    );
+    process.exit(1);
+  }
+
+  const authUrl = buildGoogleAuthUrl();
 
   return new Promise((resolve, reject) => {
     const server = http.createServer(async (req, res) => {
@@ -166,6 +163,7 @@ async function login() {
 
       server.close();
 
+      const code  = parsed.query.code;
       const error = parsed.query.error;
       if (error) {
         console.log(chalk.red('\n  ✗ Login cancelled.\n'));
@@ -175,7 +173,7 @@ async function login() {
 
       try {
         process.stdout.write(chalk.cyan('\n  ⏳ Verifying with Firebase...\n'));
-        const userData = await handleFirebaseCallback(parsed.query);
+        const userData = await exchangeCodeForToken(code);
         saveToken(userData);
 
         console.log(

package/cli.js

@@ -308,7 +308,7 @@ async function processInput(input, rl) {
   }
 
   const spinner = ora({
-    text:       chalk.cyan('  Connecting to NVIDIA API...'),
+    text:       chalk.cyan('  Connecting to SLEK Server...'),
     spinner:    'dots',
     color:      'cyan',
     prefixText: ' ',

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "slek-ai-cli",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "SLEK AI CLI — Powered by NVIDIA API",
   "main": "cli.js",
   "bin": {
-    "slek": "cli.js"
+    "slek": "./cli.js"
   },
   "scripts": {
     "start": "node cli.js"