@micropage-sh/cli 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micropage-sh/cli",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "CLI for micropage.sh - create, sync, and publish microsites",
   "main": "src/index.js",
   "bin": {

package/src/commands/login.js

@@ -2,9 +2,10 @@
 
 const http = require('http');
 const { randomBytes } = require('crypto');
-const { setSession, getSession } = require('../auth');
+const { setSession, getSession, clearSession } = require('../auth');
 const { getUserInfo, getValidAccessToken } = require('../supabase');
 const { APP_URL, SUPABASE_URL, SUPABASE_ANON_KEY } = require('../config');
+const { UPGRADE_MESSAGE, isPaidTier, getPlanTierWithToken } = require('../plan');
 
 // Find an available ephemeral port by briefly binding to port 0.
 function getFreePort() {
@@ -164,11 +165,24 @@ async function run(options = {}) {
     const existing = getSession();
     if (existing) {
       try {
-        await getValidAccessToken();
-        const email = existing.user?.email || 'unknown';
-        console.log(`Already logged in as ${email}.`);
-        console.log('Use --force to re-authenticate.');
-        return;
+        const accessToken = await getValidAccessToken();
+        const planTier = await getPlanTierWithToken(existing.user?.id, accessToken);
+        if (!isPaidTier(planTier)) {
+          clearSession();
+          console.error(UPGRADE_MESSAGE);
+          process.exit(1);
+        }
+        const displayName = existing.user?.email
+          || existing.user?.user_metadata?.full_name
+          || existing.user?.user_metadata?.user_name
+          || existing.user?.user_metadata?.name
+          || existing.user?.id;
+        if (displayName) {
+          console.log(`Already logged in as ${displayName}.`);
+          console.log('Use --force to re-authenticate.');
+          process.exit(0);
+        }
+        // No identifiable display name on the cached user — fall through to a fresh login.
       } catch {
         // Token expired or refresh failed — fall through to re-login
       }
@@ -240,10 +254,27 @@ async function run(options = {}) {
     server.close();
 
     const user = await getUserInfo(access_token);
+    if (!user?.id) {
+      console.error('Login failed: could not load user profile.');
+      process.exit(1);
+    }
+
+    const planTier = await getPlanTierWithToken(user.id, access_token);
+    if (!isPaidTier(planTier)) {
+      // Free-tier (or unconfirmed) users get no session at all.
+      console.error(UPGRADE_MESSAGE);
+      process.exit(1);
+    }
+
     setSession({ access_token, refresh_token, user });
 
-    const displayName = user?.email || user?.user_metadata?.user_name || 'unknown';
+    const displayName = user.email
+      || user.user_metadata?.full_name
+      || user.user_metadata?.user_name
+      || user.user_metadata?.name
+      || user.id;
     console.log(`Logged in as ${displayName}`);
+    process.exit(0);
   } catch (err) {
     clearTimeout(timeout);
     server.close();

package/src/commands/logout.js

@@ -9,8 +9,16 @@ function run() {
     return;
   }
   clearSession();
-  const email = session.user?.email || 'unknown';
-  console.log(`Logged out (was: ${email}).`);
+  const displayName = session.user?.email
+    || session.user?.user_metadata?.full_name
+    || session.user?.user_metadata?.user_name
+    || session.user?.user_metadata?.name
+    || session.user?.id;
+  if (displayName) {
+    console.log(`Logged out (was: ${displayName}).`);
+  } else {
+    console.log('Logged out.');
+  }
 }
 
 module.exports = { run };

package/src/commands/whoami.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const { getSession } = require('../auth');
+const { getSession, clearSession } = require('../auth');
 const { db, getUserInfo, getValidAccessToken, handleAuthError } = require('../supabase');
+const { UPGRADE_MESSAGE, isPaidTier } = require('../plan');
 
 async function run() {
   const session = getSession();
@@ -25,35 +26,41 @@ async function run() {
     process.exit(1);
   }
 
-  console.log('User ID:   ', user.id);
-  console.log('Email:     ', user.email || '-');
-  const name =
-    user.user_metadata?.full_name ||
-    user.user_metadata?.user_name ||
-    user.user_metadata?.name ||
-    '-';
-  console.log('Name:      ', name);
-  if (user.app_metadata?.provider) {
-    console.log('Auth via:  ', user.app_metadata.provider);
-  }
-
-  // Billing / subscription overview (best-effort; do not fail whoami if this breaks).
+  // Gate access on plan first — free-tier accounts get no session and no detail dump.
   let planTier = 'free';
-  let subscription = null;
   try {
     const customer = await db
       .from('customers')
       .select('plan_tier')
       .eq('user_id', user.id)
       .single();
-    if (customer?.plan_tier) {
+    if (customer?.plan_tier === 'pro' || customer?.plan_tier === 'pro_plus') {
       planTier = customer.plan_tier;
     }
   } catch (err) {
     handleAuthError(err);
-    console.error('Warning: failed to load plan info:', err.message);
+    // If we cannot determine plan, default to free → deny CLI access below.
   }
 
+  if (!isPaidTier(planTier)) {
+    clearSession();
+    console.error(UPGRADE_MESSAGE);
+    process.exit(1);
+  }
+
+  console.log('User ID:   ', user.id);
+  console.log('Email:     ', user.email || '-');
+  const name =
+    user.user_metadata?.full_name ||
+    user.user_metadata?.user_name ||
+    user.user_metadata?.name ||
+    '-';
+  console.log('Name:      ', name);
+  if (user.app_metadata?.provider) {
+    console.log('Auth via:  ', user.app_metadata.provider);
+  }
+
+  let subscription = null;
   try {
     const subs = await db
       .from('subscriptions')

package/src/index.js

@@ -18,7 +18,7 @@ const program = new Command();
 program
   .name('micropage')
   .description('CLI for micropage.sh – create, sync, and publish microsites')
-  .version('2.0.0');
+  .version('2.0.2');
 
 // ---------------------------------------------------------------------------
 // Authentication

package/src/plan.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const { SUPABASE_URL, SUPABASE_ANON_KEY } = require('./config');
+
+const UPGRADE_MESSAGE = [
+  'The micropage CLI is available on paid plans only.',
+  'Your account is currently on the free plan.',
+  '',
+  'Upgrade at: https://micropage.sh/pricing',
+].join('\n');
+
+function isPaidTier(tier) {
+  return tier === 'pro' || tier === 'pro_plus';
+}
+
+// Look up plan_tier using a bearer token directly so this can be called inside
+// `login` before a session is persisted. Defaults to 'free' on any failure —
+// CLI access is denied when we cannot confirm a paid tier.
+async function getPlanTierWithToken(userId, accessToken) {
+  try {
+    const url = `${SUPABASE_URL}/rest/v1/customers?select=plan_tier&user_id=eq.${encodeURIComponent(userId)}&limit=1`;
+    const res = await fetch(url, {
+      headers: {
+        apikey: SUPABASE_ANON_KEY,
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+    if (!res.ok) return 'free';
+    const data = await res.json();
+    const row = Array.isArray(data) ? data[0] : null;
+    if (row?.plan_tier === 'pro' || row?.plan_tier === 'pro_plus') {
+      return row.plan_tier;
+    }
+    return 'free';
+  } catch {
+    return 'free';
+  }
+}
+
+module.exports = { UPGRADE_MESSAGE, isPaidTier, getPlanTierWithToken };