@webmate-studio/cli 0.3.10 → 0.3.12

package/bin/wm.mjs

@@ -9,6 +9,7 @@ import { generate } from '../src/commands/generate.js';
 import { logout } from '../src/commands/logout.js';
 import { info } from '../src/commands/info.js';
 import { switchCommand } from '../src/commands/switch.js';
+import { switchOrgCommand } from '../src/commands/switch-org.js';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
@@ -81,7 +82,13 @@ program
 // wm switch - Switch to a different project
 program
 	.command('switch')
-	.description('Switch to a different project')
+	.description('Switch to a different project within current organization')
 	.action(switchCommand);
 
+// wm switch-org - Switch to a different organization
+program
+	.command('switch-org')
+	.description('Switch to a different organization')
+	.action(switchOrgCommand);
+
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmate-studio/cli",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "type": "module",
   "description": "Webmate Studio CLI - Build and manage your Webmate components",
   "keywords": [
@@ -24,7 +24,8 @@
     "src"
   ],
   "exports": {
-    ".": "./src/index.js"
+    ".": "./src/index.js",
+    "./package.json": "./package.json"
   },
   "publishConfig": {
     "access": "public"
@@ -34,7 +35,7 @@
     "@webmate-studio/builder": "^0.2.1",
     "@webmate-studio/core": "^0.2.0",
     "@webmate-studio/parser": "^0.2.1",
-    "@webmate-studio/preview": "^0.2.8",
+    "@webmate-studio/preview": "^0.2.10",
     "alpinejs": "^3.15.0",
     "commander": "^11.0.0",
     "esbuild": "^0.19.0",

package/src/commands/login.js

@@ -106,11 +106,49 @@ export async function loginCommand(options = {}) {
 		const loginData = await loginResponse.json();
 		logger.success(`Eingeloggt als ${pc.cyan(loginData.user.email)}`);
 
-		// Get list of tenants
+		// Get list of organizations
+		console.log('');
+		logger.info('Lade Organizations...');
+
+		const organizationsUrl = `${baseUrl}/api/cli/organizations?userId=${loginData.user.id}`;
+		const organizationsResponse = await secureFetch(organizationsUrl);
+
+		if (!organizationsResponse.ok) {
+			throw new Error('Fehler beim Laden der Organizations');
+		}
+
+		const organizationsData = await organizationsResponse.json();
+
+		if (!organizationsData.organizations || organizationsData.organizations.length === 0) {
+			logger.warning('Keine Organizations gefunden. Bitte erstelle zuerst eine Organization im CMS.');
+			return;
+		}
+
+		// Let user select organization
+		let selectedOrganizationId;
+		if (organizationsData.organizations.length === 1) {
+			// Auto-select if only one organization
+			selectedOrganizationId = organizationsData.organizations[0].id;
+			logger.info(`Organization: ${pc.cyan(organizationsData.organizations[0].name)}`);
+		} else {
+			console.log('');
+			selectedOrganizationId = await select({
+				message: 'Wähle eine Organization:',
+				choices: organizationsData.organizations.map(org => ({
+					name: `${org.name} (${org.role})`,
+					value: org.id,
+					description: `Erstellt am ${new Date(org.createdAt).toLocaleDateString('de-DE')}`
+				}))
+			});
+		}
+
+		const selectedOrganization = organizationsData.organizations.find(o => o.id === selectedOrganizationId);
+
+		// Get list of tenants for selected organization
 		console.log('');
 		logger.info('Lade Projekte...');
 
-		const tenantsUrl = `${baseUrl}/api/cli/tenants?userId=${loginData.user.id}`;
+		const tenantsUrl = `${baseUrl}/api/cli/organizations/${selectedOrganizationId}/tenants?userId=${loginData.user.id}`;
 		const tenantsResponse = await secureFetch(tenantsUrl);
 
 		if (!tenantsResponse.ok) {
@@ -120,7 +158,7 @@ export async function loginCommand(options = {}) {
 		const tenantsData = await tenantsResponse.json();
 
 		if (!tenantsData.tenants || tenantsData.tenants.length === 0) {
-			logger.warning('Keine Projekte gefunden. Bitte erstelle zuerst ein Projekt im CMS.');
+			logger.warning('Keine Projekte in dieser Organization gefunden. Bitte erstelle zuerst ein Projekt im CMS.');
 			return;
 		}
 
@@ -160,6 +198,7 @@ export async function loginCommand(options = {}) {
 		// Save auth data
 		saveAuth({
 			user: loginData.user,
+			organization: selectedOrganization,
 			tenant: selectedTenant,
 			apiToken: tokenData.apiToken,
 			baseUrl,
@@ -169,6 +208,7 @@ export async function loginCommand(options = {}) {
 		console.log('');
 		logger.success(pc.green('✨ Login erfolgreich!'));
 		console.log('');
+		console.log(`  ${pc.bold('Organization:')} ${pc.cyan(selectedOrganization.name)}`);
 		console.log(`  ${pc.bold('Projekt:')} ${pc.cyan(selectedTenant.name)}`);
 		console.log(`  ${pc.bold('Subdomain:')} ${pc.cyan(selectedTenant.subdomain)}`);
 		console.log('');

package/src/commands/switch-org.js

@@ -0,0 +1,177 @@
+import { loadAuth, saveAuth } from '../utils/auth.js';
+import { logger } from '@webmate-studio/core';
+import pc from 'picocolors';
+import { select } from '@inquirer/prompts';
+
+/**
+ * Custom fetch wrapper that accepts self-signed certificates for localhost
+ */
+async function secureFetch(url, options = {}) {
+	const isLocalhost = url.includes('localhost') || url.includes('127.0.0.1');
+
+	if (isLocalhost) {
+		const originalValue = process.env.NODE_TLS_REJECT_UNAUTHORIZED;
+		process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+
+		try {
+			return await fetch(url, options);
+		} finally {
+			if (originalValue !== undefined) {
+				process.env.NODE_TLS_REJECT_UNAUTHORIZED = originalValue;
+			} else {
+				delete process.env.NODE_TLS_REJECT_UNAUTHORIZED;
+			}
+		}
+	}
+
+	return fetch(url, options);
+}
+
+/**
+ * Switch Organization command - Switch to a different organization
+ */
+export async function switchOrgCommand(options = {}) {
+	try {
+		const auth = loadAuth();
+
+		if (!auth) {
+			logger.error('Not logged in. Run ' + pc.cyan('wm login') + ' first');
+			process.exit(1);
+		}
+
+		console.log();
+		logger.info(pc.bold('Switch Organization'));
+		console.log();
+
+		// Load available organizations for this user
+		logger.info('Loading available organizations...');
+
+		const organizationsUrl = `${auth.baseUrl}/api/cli/organizations?userId=${auth.user.id}`;
+		const organizationsResponse = await secureFetch(organizationsUrl);
+
+		if (!organizationsResponse.ok) {
+			throw new Error('Failed to load organizations from CMS');
+		}
+
+		const organizationsData = await organizationsResponse.json();
+
+		if (!organizationsData.organizations || organizationsData.organizations.length === 0) {
+			logger.error('No organizations found');
+			process.exit(1);
+		}
+
+		// Show current organization
+		const currentOrganization = auth.organization;
+		console.log();
+		if (currentOrganization) {
+			console.log(pc.gray('  Current: ') + pc.cyan(currentOrganization.name));
+		}
+		console.log();
+
+		// Let user select a different organization
+		const selectedOrganizationId = await select({
+			message: 'Switch to:',
+			choices: organizationsData.organizations.map(org => ({
+				name: `${org.name} (${org.role})`,
+				value: org.id,
+				description: org.id === currentOrganization?.id ? 'Current organization' : `Created ${new Date(org.createdAt).toLocaleDateString('de-DE')}`
+			}))
+		});
+
+		const selectedOrganization = organizationsData.organizations.find(o => o.id === selectedOrganizationId);
+
+		// If same organization, no need to switch
+		if (currentOrganization && selectedOrganization.id === currentOrganization.id) {
+			console.log();
+			logger.info('Already using this organization');
+			return;
+		}
+
+		// Load tenants for new organization
+		console.log();
+		logger.info('Loading projects...');
+
+		const tenantsUrl = `${auth.baseUrl}/api/cli/organizations/${selectedOrganizationId}/tenants?userId=${auth.user.id}`;
+		const tenantsResponse = await secureFetch(tenantsUrl);
+
+		if (!tenantsResponse.ok) {
+			throw new Error('Failed to load projects');
+		}
+
+		const tenantsData = await tenantsResponse.json();
+
+		if (!tenantsData.tenants || tenantsData.tenants.length === 0) {
+			logger.warning('No projects found in this organization. Please create a project first.');
+
+			// Update auth with new organization but no tenant
+			const newAuth = {
+				...auth,
+				organization: selectedOrganization,
+				tenant: null,
+				apiToken: null
+			};
+			saveAuth(newAuth);
+
+			console.log();
+			logger.success(pc.green('✨ Switched to organization: ') + pc.cyan(selectedOrganization.name));
+			console.log();
+			return;
+		}
+
+		// Let user select a tenant
+		const selectedTenantId = await select({
+			message: 'Select a project:',
+			choices: tenantsData.tenants.map(t => ({
+				name: `${t.name} (${t.subdomain})`,
+				value: t.id,
+				description: `Created ${new Date(t.createdAt).toLocaleDateString('de-DE')}`
+			}))
+		});
+
+		const selectedTenant = tenantsData.tenants.find(t => t.id === selectedTenantId);
+
+		// Generate API token for selected tenant
+		console.log();
+		logger.info('Generating API token...');
+
+		const tokenUrl = `${auth.baseUrl}/api/cli/tenants`;
+		const tokenResponse = await secureFetch(tokenUrl, {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({
+				userId: auth.user.id,
+				tenantId: selectedTenantId
+			})
+		});
+
+		if (!tokenResponse.ok) {
+			throw new Error('Failed to generate API token');
+		}
+
+		const tokenData = await tokenResponse.json();
+
+		// Update auth with new organization, tenant and token
+		const newAuth = {
+			...auth,
+			organization: selectedOrganization,
+			tenant: selectedTenant,
+			apiToken: tokenData.apiToken
+		};
+
+		saveAuth(newAuth);
+
+		console.log();
+		logger.success(pc.green('✨ Switched to organization: ') + pc.cyan(selectedOrganization.name));
+		console.log();
+		console.log(`  ${pc.bold('Project:')} ${pc.cyan(selectedTenant.name)}`);
+		console.log(`  ${pc.bold('Subdomain:')} ${pc.cyan(selectedTenant.subdomain)}`);
+		console.log();
+		console.log(pc.yellow('⚠  ') + pc.gray('If you have ') + pc.cyan('wm dev') + pc.gray(' running, please restart it to load the new project.'));
+		console.log();
+
+	} catch (error) {
+		console.log();
+		logger.error(`Switch organization failed: ${error.message}`);
+		process.exit(1);
+	}
+}

package/src/commands/switch.js

@@ -39,14 +39,23 @@ export async function switchCommand(options = {}) {
 			process.exit(1);
 		}
 
+		if (!auth.organization) {
+			logger.error('No organization selected. Run ' + pc.cyan('wm switch-org') + ' first');
+			process.exit(1);
+		}
+
 		console.log();
 		logger.info(pc.bold('Switch Project'));
 		console.log();
 
-		// Load available tenants for this user
+		// Show current organization
+		console.log(pc.gray('  Organization: ') + pc.cyan(auth.organization.name));
+		console.log();
+
+		// Load available tenants for current organization
 		logger.info('Loading available projects...');
 
-		const tenantsUrl = `${auth.baseUrl}/api/cli/tenants?userId=${auth.user.id}`;
+		const tenantsUrl = `${auth.baseUrl}/api/cli/organizations/${auth.organization.id}/tenants?userId=${auth.user.id}`;
 		const tenantsResponse = await secureFetch(tenantsUrl);
 
 		if (!tenantsResponse.ok) {
@@ -56,7 +65,10 @@ export async function switchCommand(options = {}) {
 		const tenantsData = await tenantsResponse.json();
 
 		if (!tenantsData.tenants || tenantsData.tenants.length === 0) {
-			logger.error('No projects found');
+			logger.error('No projects found in this organization');
+			console.log();
+			console.log(pc.gray('  Tip: Use ') + pc.cyan('wm switch-org') + pc.gray(' to switch to a different organization'));
+			console.log();
 			process.exit(1);
 		}