omnibiofex 2.8.4 → 2.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnibiofex",
-  "version": "2.8.4",
+  "version": "2.8.5",
   "description": "OmniBioFex X - The Autonomous Research Terminal for AI-powered research missions",
   "main": "bin/obx",
   "bin": {

package/src/auth.js

@@ -351,4 +351,65 @@ async function getAuthToken() {
   return token;
 }
 
-module.exports = { login, logout, isAuthenticated, getAuthToken, refreshAuthToken };
+// ==================== USER EXTRACTION FUNCTIONS ====================
+
+/**
+ * Decode base64url to string (handles JWT format)
+ */
+function base64UrlDecode(str) {
+  let base64 = str.replace(/-/g, '+').replace(/_/g, '/');
+  while (base64.length % 4) {
+    base64 += '=';
+  }
+  return Buffer.from(base64, 'base64').toString('utf8');
+}
+
+/**
+ * Decode JWT token to extract user info
+ */
+function decodeToken() {
+  const token = config.get('authToken'); // fixed key name
+  if (!token) return null;
+  
+  try {
+    const parts = token.split('.');
+    if (parts.length !== 3) return null;
+    
+    const payload = parts[1];
+    const decoded = base64UrlDecode(payload);
+    const data = JSON.parse(decoded);
+    
+    return {
+      uid: data.user_id || data.sub,
+      email: data.email,
+      exp: data.exp
+    };
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * Get current user UID from stored token
+ */
+function getCurrentUserUid() {
+  const decoded = decodeToken();
+  return decoded ? decoded.uid : null;
+}
+
+/**
+ * Get current user email from stored token
+ */
+function getCurrentUserEmail() {
+  const decoded = decodeToken();
+  return decoded ? decoded.email : null;
+}
+
+module.exports = {
+  login,
+  logout,
+  getAuthToken,
+  isAuthenticated,
+  getCurrentUserUid,
+  getCurrentUserEmail
+};

package/src/commands/account.js

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 const open = require('open');
-const { getAuthToken, isAuthenticated } = require('../auth');
-const { db, getCurrentUserUid, getCurrentUserEmail } = require('../firebase');
+const { getAuthToken, isAuthenticated, getCurrentUserUid, getCurrentUserEmail } = require('../auth');
+const { db } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
 const { collection, query, where, getDocs } = require('firebase/firestore');
 

package/src/commands/earnings.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk');
-const { isAuthenticated } = require('../auth');
-const { db, getCurrentUserUid, getCurrentUserEmail } = require('../firebase');
+const { isAuthenticated, getCurrentUserUid, getCurrentUserEmail } = require('../auth');
+const { db } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
 const { collection, query, where, orderBy, limit, getDocs } = require('firebase/firestore');
 

package/src/commands/morning.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk');
-const { isAuthenticated } = require('../auth');
-const { db, getCurrentUserUid, getCurrentUserEmail } = require('../firebase');
+const { isAuthenticated, getCurrentUserUid, getCurrentUserEmail } = require('../auth');
+const { db } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
 const { collection, query, where, orderBy, limit, getDocs } = require('firebase/firestore');
 

package/src/commands/publish.js

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 const inquirer = require('inquirer');
-const { getAuthToken, isAuthenticated } = require('../auth');
-const { db, getCurrentUserUid, getCurrentUserEmail } = require('../firebase');
+const { getAuthToken, isAuthenticated, getCurrentUserUid, getCurrentUserEmail } = require('../auth');
+const { db } = require('../firebase');
 const { PremiumSpinner, sleep } = require('../utils/display');
 const { collection, query, where, orderBy, limit, getDocs, doc, updateDoc } = require('firebase/firestore');
 

package/src/firebase.js

@@ -1,7 +1,6 @@
 const { initializeApp, getApps } = require('firebase/app');
 const { getAuth } = require('firebase/auth');
 const { getFirestore } = require('firebase/firestore');
-const Conf = require('conf');
 
 const firebaseConfig = {
   apiKey: "AIzaSyDlgXId4pLlYqm-MDuhfz3dLH24KBRHkw8",
@@ -23,110 +22,13 @@ if (getApps().length === 0) {
 const auth = getAuth(app);
 const db = getFirestore(app);
 
-// Shared Conf storage for tokens
-const tokenStore = new Conf({
-  projectName: 'omnibiofex',
-  schema: {
-    token: { type: 'string' },
-    refreshToken: { type: 'string' },
-    expiresAt: { type: 'number' }
-  }
-});
-
-/**
- * Decode base64url to string (handles JWT format)
- * @param {string} str - Base64url encoded string
- * @returns {string} - Decoded string
- */
-function base64UrlDecode(str) {
-  // Replace URL-safe characters with standard base64
-  let base64 = str.replace(/-/g, '+').replace(/_/g, '/');
-  // Add padding if needed
-  while (base64.length % 4) {
-    base64 += '=';
-  }
-  return Buffer.from(base64, 'base64').toString('utf8');
-}
-
-/**
- * Decode JWT token to extract user info
- * @returns {Object|null} - { uid, email, exp } or null if no token
- */
-function decodeToken() {
-  const token = tokenStore.get('token');
-  if (!token) return null;
-  
-  try {
-    // JWT format: header.payload.signature
-    const parts = token.split('.');
-    if (parts.length !== 3) {
-      console.error('Invalid JWT format: expected 3 parts, got', parts.length);
-      return null;
-    }
-    
-    // Decode payload (base64url)
-    const payload = parts[1];
-    const decoded = base64UrlDecode(payload);
-    const data = JSON.parse(decoded);
-    
-    // Firebase tokens use 'user_id' or 'sub' for UID
-    const uid = data.user_id || data.sub;
-    
-    if (!uid) {
-      console.error('No user_id or sub found in token payload');
-      console.error('Token payload keys:', Object.keys(data));
-      return null;
-    }
-    
-    return {
-      uid: uid,
-      email: data.email,
-      exp: data.exp
-    };
-  } catch (error) {
-    console.error('Token decode error:', error.message);
-    return null;
-  }
-}
-
-/**
- * Get current user UID from stored token
- * @returns {string|null} - User UID or null
- */
-function getCurrentUserUid() {
-  const decoded = decodeToken();
-  return decoded ? decoded.uid : null;
-}
-
-/**
- * Get current user email from stored token
- * @returns {string|null} - User email or null
- */
-function getCurrentUserEmail() {
-  const decoded = decodeToken();
-  return decoded ? decoded.email : null;
-}
-
-/**
- * Check if token is valid (not expired)
- * @returns {boolean}
- */
-function isTokenValid() {
-  const decoded = decodeToken();
-  if (!decoded || !decoded.exp) return false;
-  
-  // JWT exp is in seconds, Date.now() is in milliseconds
-  const now = Math.floor(Date.now() / 1000);
-  return decoded.exp > now;
-}
+// Re-export user functions from auth.js (single source of truth)
+const { getCurrentUserUid, getCurrentUserEmail } = require('./auth');
 
 module.exports = { 
   app, 
   auth, 
-  db, 
-  tokenStore,
-  decodeToken,
+  db,
   getCurrentUserUid,
-  getCurrentUserEmail,
-  isTokenValid
+  getCurrentUserEmail
 };