skedyul 1.0.2 → 1.0.4

package/dist/cli/utils/auth.js

@@ -33,6 +33,17 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateProfileName = generateProfileName;
+exports.ensureUniqueProfileName = ensureUniqueProfileName;
+exports.getProfiles = getProfiles;
+exports.saveProfiles = saveProfiles;
+exports.getProfile = getProfile;
+exports.saveProfile = saveProfile;
+exports.deleteProfile = deleteProfile;
+exports.listProfiles = listProfiles;
+exports.clearAllProfiles = clearAllProfiles;
+exports.getActiveProfileName = getActiveProfileName;
+exports.setActiveProfile = setActiveProfile;
 exports.getCredentials = getCredentials;
 exports.saveCredentials = saveCredentials;
 exports.clearCredentials = clearCredentials;
@@ -52,9 +63,9 @@ const http = __importStar(require("http"));
 // Paths
 // ─────────────────────────────────────────────────────────────────────────────
 const SKEDYUL_HOME_DIR = path.join(os.homedir(), '.skedyul');
-const CREDENTIALS_FILE = path.join(SKEDYUL_HOME_DIR, 'credentials.json');
+const PROFILES_FILE = path.join(SKEDYUL_HOME_DIR, 'profiles.json');
 const CONFIG_FILE = path.join(SKEDYUL_HOME_DIR, 'config.json');
-// Local project config (for development overrides)
+const LEGACY_CREDENTIALS_FILE = path.join(SKEDYUL_HOME_DIR, 'credentials.json');
 const LOCAL_CONFIG_FILE = '.skedyul.local.json';
 const DEFAULT_SERVER_URL = 'https://admin.skedyul.it';
 // ─────────────────────────────────────────────────────────────────────────────
@@ -66,37 +77,234 @@ function ensureHomeDir() {
     }
 }
 // ─────────────────────────────────────────────────────────────────────────────
-// Credentials Management
+// Profile Name Generation
 // ─────────────────────────────────────────────────────────────────────────────
-function getCredentials() {
-    if (!fs.existsSync(CREDENTIALS_FILE)) {
-        return null;
-    }
+/**
+ * Generate a sensible profile name from a server URL.
+ */
+function generateProfileName(serverUrl) {
     try {
-        const content = fs.readFileSync(CREDENTIALS_FILE, 'utf-8');
-        const credentials = JSON.parse(content);
-        // Check if expired
-        if (credentials.expiresAt) {
-            const expiresAt = new Date(credentials.expiresAt);
-            if (expiresAt < new Date()) {
-                return null;
-            }
+        const url = new URL(serverUrl);
+        const hostname = url.hostname.toLowerCase();
+        if (hostname === 'localhost' || hostname === '127.0.0.1') {
+            return 'local';
+        }
+        if (hostname.includes('staging')) {
+            return 'staging';
+        }
+        if (hostname === 'admin.skedyul.it' || hostname === 'app.skedyul.com') {
+            return 'production';
         }
-        return credentials;
+        const parts = hostname.split('.');
+        if (parts.length > 0) {
+            return parts[0].replace(/[^a-z0-9-]/g, '');
+        }
+        return 'default';
     }
     catch {
-        return null;
+        return 'default';
+    }
+}
+/**
+ * Ensure a profile name is unique by appending a number if needed.
+ */
+function ensureUniqueProfileName(baseName, existingProfiles) {
+    if (!existingProfiles[baseName]) {
+        return baseName;
+    }
+    let counter = 2;
+    while (existingProfiles[`${baseName}-${counter}`]) {
+        counter++;
+    }
+    return `${baseName}-${counter}`;
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// Migration from Legacy credentials.json
+// ─────────────────────────────────────────────────────────────────────────────
+function migrateLegacyCredentials() {
+    if (!fs.existsSync(LEGACY_CREDENTIALS_FILE)) {
+        return;
+    }
+    if (fs.existsSync(PROFILES_FILE)) {
+        return;
+    }
+    try {
+        const content = fs.readFileSync(LEGACY_CREDENTIALS_FILE, 'utf-8');
+        const legacy = JSON.parse(content);
+        const profileName = generateProfileName(legacy.serverUrl);
+        const profile = {
+            serverUrl: legacy.serverUrl,
+            token: legacy.token,
+            userId: legacy.userId,
+            username: legacy.username,
+            email: legacy.email,
+            expiresAt: legacy.expiresAt,
+            createdAt: legacy.createdAt,
+        };
+        const profilesFile = {
+            profiles: {
+                [profileName]: profile,
+            },
+        };
+        ensureHomeDir();
+        fs.writeFileSync(PROFILES_FILE, JSON.stringify(profilesFile, null, 2), {
+            mode: 0o600,
+        });
+        const config = getConfig();
+        config.activeProfile = profileName;
+        saveConfig(config);
+        fs.unlinkSync(LEGACY_CREDENTIALS_FILE);
+        console.error(`Migrated credentials to profile: ${profileName}`);
+    }
+    catch (error) {
+        console.error('Failed to migrate legacy credentials:', error);
     }
 }
-function saveCredentials(credentials) {
+// ─────────────────────────────────────────────────────────────────────────────
+// Profiles Management
+// ─────────────────────────────────────────────────────────────────────────────
+function getProfiles() {
+    migrateLegacyCredentials();
+    if (!fs.existsSync(PROFILES_FILE)) {
+        return { profiles: {} };
+    }
+    try {
+        const content = fs.readFileSync(PROFILES_FILE, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch {
+        return { profiles: {} };
+    }
+}
+function saveProfiles(profilesFile) {
     ensureHomeDir();
-    fs.writeFileSync(CREDENTIALS_FILE, JSON.stringify(credentials, null, 2), {
-        mode: 0o600, // Read/write for owner only
+    fs.writeFileSync(PROFILES_FILE, JSON.stringify(profilesFile, null, 2), {
+        mode: 0o600,
     });
 }
+function getProfile(name) {
+    const profilesFile = getProfiles();
+    const profile = profilesFile.profiles[name];
+    if (!profile) {
+        return null;
+    }
+    if (profile.expiresAt) {
+        const expiresAt = new Date(profile.expiresAt);
+        if (expiresAt < new Date()) {
+            return null;
+        }
+    }
+    return profile;
+}
+function saveProfile(name, profile) {
+    const profilesFile = getProfiles();
+    profilesFile.profiles[name] = profile;
+    saveProfiles(profilesFile);
+}
+function deleteProfile(name) {
+    const profilesFile = getProfiles();
+    if (!profilesFile.profiles[name]) {
+        return false;
+    }
+    delete profilesFile.profiles[name];
+    saveProfiles(profilesFile);
+    const config = getConfig();
+    if (config.activeProfile === name) {
+        const remainingProfiles = Object.keys(profilesFile.profiles);
+        config.activeProfile = remainingProfiles[0] ?? undefined;
+        saveConfig(config);
+    }
+    return true;
+}
+function listProfiles() {
+    const profilesFile = getProfiles();
+    const config = getConfig();
+    const activeProfile = config.activeProfile;
+    return Object.entries(profilesFile.profiles).map(([name, profile]) => {
+        let isExpired = false;
+        if (profile.expiresAt) {
+            isExpired = new Date(profile.expiresAt) < new Date();
+        }
+        return {
+            name,
+            profile,
+            isActive: name === activeProfile,
+            isExpired,
+        };
+    });
+}
+function clearAllProfiles() {
+    if (fs.existsSync(PROFILES_FILE)) {
+        fs.unlinkSync(PROFILES_FILE);
+    }
+    const config = getConfig();
+    delete config.activeProfile;
+    saveConfig(config);
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// Active Profile Management
+// ─────────────────────────────────────────────────────────────────────────────
+function getActiveProfileName() {
+    const config = getConfig();
+    return config.activeProfile ?? null;
+}
+function setActiveProfile(name) {
+    const profilesFile = getProfiles();
+    if (!profilesFile.profiles[name]) {
+        return false;
+    }
+    const config = getConfig();
+    config.activeProfile = name;
+    saveConfig(config);
+    return true;
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// Credentials Management (uses active profile)
+// ─────────────────────────────────────────────────────────────────────────────
+function getCredentials() {
+    const activeProfileName = getActiveProfileName();
+    if (!activeProfileName) {
+        return null;
+    }
+    const profile = getProfile(activeProfileName);
+    if (!profile) {
+        return null;
+    }
+    return {
+        token: profile.token,
+        userId: profile.userId,
+        username: profile.username,
+        email: profile.email,
+        serverUrl: profile.serverUrl,
+        expiresAt: profile.expiresAt,
+        createdAt: profile.createdAt,
+    };
+}
+function saveCredentials(credentials, profileName) {
+    const name = profileName ?? generateProfileName(credentials.serverUrl);
+    const profilesFile = getProfiles();
+    const finalName = profileName
+        ? name
+        : ensureUniqueProfileName(name, profilesFile.profiles);
+    const profile = {
+        serverUrl: credentials.serverUrl,
+        token: credentials.token,
+        userId: credentials.userId,
+        username: credentials.username,
+        email: credentials.email,
+        expiresAt: credentials.expiresAt,
+        createdAt: credentials.createdAt,
+    };
+    saveProfile(finalName, profile);
+    const config = getConfig();
+    config.activeProfile = finalName;
+    saveConfig(config);
+    return finalName;
+}
 function clearCredentials() {
-    if (fs.existsSync(CREDENTIALS_FILE)) {
-        fs.unlinkSync(CREDENTIALS_FILE);
+    const activeProfileName = getActiveProfileName();
+    if (activeProfileName) {
+        deleteProfile(activeProfileName);
     }
 }
 // ─────────────────────────────────────────────────────────────────────────────
@@ -137,21 +345,17 @@ function getLocalConfig() {
 }
 /**
  * Get the server URL to use.
- * Priority: CLI flag > local config > credentials > global config > default
+ * Priority: CLI flag > local config > active profile > global config > default
  */
 function getServerUrl(override) {
-    // 1. CLI flag takes precedence
     if (override)
         return override;
-    // 2. Local project config (for development)
     const localConfig = getLocalConfig();
     if (localConfig.serverUrl)
         return localConfig.serverUrl;
-    // 3. Stored credentials
     const credentials = getCredentials();
     if (credentials?.serverUrl)
         return credentials.serverUrl;
-    // 4. Global config
     return getConfig().defaultServer;
 }
 /**
@@ -183,7 +387,6 @@ async function startOAuthCallback(serverUrl) {
         const server = http.createServer((req, res) => {
             const url = new URL(req.url ?? '/', `http://localhost`);
             const searchParams = url.searchParams;
-            // Handle callback
             if (url.pathname === '/callback') {
                 const token = searchParams.get('token');
                 const userId = searchParams.get('userId');
@@ -227,7 +430,7 @@ async function startOAuthCallback(serverUrl) {
                 res.end(`
           <html>
             <body style="font-family: system-ui; padding: 40px; text-align: center;">
-              <h1 style="color: #38a169;">✓ Authentication Successful</h1>
+              <h1 style="color: #38a169;">Authentication Successful</h1>
               <p>Logged in as <strong>${email}</strong></p>
               <p>You can close this window and return to the terminal.</p>
             </body>
@@ -248,7 +451,6 @@ async function startOAuthCallback(serverUrl) {
                 res.end('Not found');
             }
         });
-        // Find an available port
         server.listen(0, '127.0.0.1', () => {
             const address = server.address();
             if (!address || typeof address === 'string') {
@@ -262,7 +464,6 @@ async function startOAuthCallback(serverUrl) {
             console.log(`Opening browser for authentication...`);
             console.log(`If browser doesn't open, visit: ${authUrl}`);
             console.log(`Waiting for callback on ${callbackUrl}...`);
-            // Try to open browser
             openBrowser(authUrl).catch(() => {
                 console.log(`(Could not open browser automatically)`);
             });
@@ -271,7 +472,6 @@ async function startOAuthCallback(serverUrl) {
             cleanup();
             reject(err);
         });
-        // Timeout after 5 minutes
         timeoutId = setTimeout(() => {
             server.close();
             reject(new Error('Authentication timed out'));
@@ -282,13 +482,11 @@ async function startOAuthCallback(serverUrl) {
  * Open a URL in the default browser
  */
 async function openBrowser(url) {
-    // Try to dynamically import 'open' package
     try {
         const open = await Promise.resolve().then(() => __importStar(require('open')));
         await open.default(url);
     }
     catch {
-        // Fallback to platform-specific commands
         const { exec } = await Promise.resolve().then(() => __importStar(require('child_process')));
         const platform = process.platform;
         let command;

package/dist/config/types/model.d.ts

@@ -23,10 +23,6 @@ import type { ResourceDependency } from './resource';
  * - 'object': JSON object
  */
 export type FieldType = 'string' | 'long_string' | 'text' | 'number' | 'boolean' | 'date' | 'datetime' | 'time' | 'file' | 'image' | 'relation' | 'object';
-/**
- * Relationship cardinality between models.
- */
-export type Cardinality = 'one_to_one' | 'one_to_many' | 'many_to_one' | 'many_to_many';
 /**
  * Behavior when a related record is deleted.
  * - 'none': No action (orphan the reference)
@@ -122,17 +118,26 @@ export interface RelationshipLink {
     field: string;
     /** Display label for this side of the relationship */
     label: string;
-    /** Cardinality from this side's perspective */
-    cardinality: Cardinality;
-    /** Behavior when this record is deleted */
-    onDelete?: OnDelete;
 }
+/**
+ * Relationship cardinality from source (one) to target (many or one).
+ * - 'one_to_one': One source record relates to one target record
+ * - 'one_to_many': One source record relates to many target records
+ *
+ * Note: For many-to-one relationships, swap source and target and use 'one_to_many'.
+ */
+export type Cardinality = 'one_to_one' | 'one_to_many';
 /**
  * Relationship definition between two models.
+ * Source is always the "one" side, target is the "many" side (for one_to_many).
  */
 export interface RelationshipDefinition {
-    /** Source side of the relationship */
+    /** Source side of the relationship (the "one" side) */
     source: RelationshipLink;
-    /** Target side of the relationship */
+    /** Target side of the relationship (the "many" side for one_to_many) */
     target: RelationshipLink;
+    /** Cardinality: 'one_to_one' or 'one_to_many' */
+    cardinality: Cardinality;
+    /** Behavior when a related record is deleted */
+    onDelete?: OnDelete;
 }