@base44-preview/cli 0.0.48-pr.445.4fa436f → 0.0.49-pr.445.2022753

package/dist/cli/index.js

@@ -243201,7 +243201,7 @@ import { join as join9 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.0.48",
+  version: "0.0.49",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -250717,24 +250717,7 @@ function getAgentsCommand() {
 
 // src/cli/commands/auth/password-login.ts
 import { dirname as dirname8, join as join13 } from "node:path";
-function validateAction(action) {
-  if (action !== "enable" && action !== "disable") {
-    throw new InvalidInputError(`Invalid action "${action}". Must be "enable" or "disable".`, {
-      hints: [
-        {
-          message: "Enable password auth:  base44 auth password-login enable",
-          command: "base44 auth password-login enable"
-        },
-        {
-          message: "Disable password auth: base44 auth password-login disable",
-          command: "base44 auth password-login disable"
-        }
-      ]
-    });
-  }
-}
 async function passwordLoginAction({ log }, action) {
-  validateAction(action);
   const shouldEnable = action === "enable";
   const { project: project2 } = await readProjectConfig();
   const configDir = dirname8(project2.configPath);
@@ -250754,7 +250737,7 @@ async function passwordLoginAction({ log }, action) {
   };
 }
 function getPasswordLoginCommand() {
-  return new Base44Command("password-login").description("Enable or disable username & password authentication").argument("<enable|disable>", "enable or disable password authentication").action(passwordLoginAction);
+  return new Base44Command("password-login").description("Enable or disable username & password authentication").addArgument(new Argument("<action>", "enable or disable password authentication").choices(["enable", "disable"])).action(passwordLoginAction);
 }
 
 // src/cli/commands/auth/pull.ts
@@ -250828,72 +250811,59 @@ function getAuthPushCommand() {
 // src/cli/commands/auth/social-login.ts
 import { dirname as dirname10, join as join15 } from "node:path";
 var SOCIAL_PROVIDERS = {
-  google: { field: "enableGoogleLogin", label: "Google" },
+  google: {
+    field: "enableGoogleLogin",
+    label: "Google",
+    customOAuth: {
+      modeField: "googleOAuthMode",
+      clientIdField: "googleOAuthClientId",
+      secretKey: "google_oauth_client_secret",
+      envVar: "BASE44_GOOGLE_OAUTH_CLIENT_SECRET",
+      promptMessage: "Enter Google OAuth client secret"
+    }
+  },
   microsoft: { field: "enableMicrosoftLogin", label: "Microsoft" },
   facebook: { field: "enableFacebookLogin", label: "Facebook" },
   apple: { field: "enableAppleLogin", label: "Apple" }
 };
 var VALID_PROVIDERS = Object.keys(SOCIAL_PROVIDERS);
-function validateProvider(provider) {
-  if (!(provider in SOCIAL_PROVIDERS)) {
-    throw new InvalidInputError(`Invalid provider "${provider}". Must be one of: ${VALID_PROVIDERS.join(", ")}.`, {
-      hints: VALID_PROVIDERS.map((p) => ({
-        message: `Enable ${SOCIAL_PROVIDERS[p].label} login:  base44 auth social-login ${p} enable`,
-        command: `base44 auth social-login ${p} enable`
-      }))
-    });
-  }
-}
-function validateAction2(action) {
-  if (action !== "enable" && action !== "disable") {
-    throw new InvalidInputError(`Invalid action "${action}". Must be "enable" or "disable".`, {
-      hints: [
-        {
-          message: "Enable social login:  base44 auth social-login <provider> enable",
-          command: "base44 auth social-login <provider> enable"
-        },
-        {
-          message: "Disable social login: base44 auth social-login <provider> disable",
-          command: "base44 auth social-login <provider> disable"
-        }
-      ]
-    });
-  }
+function hasCustomOAuthOptions(options) {
+  return Boolean(options.clientId || options.clientSecret || options.clientSecretStdin);
 }
 async function socialLoginAction({ log, isNonInteractive }, provider, action, options) {
-  validateProvider(provider);
-  validateAction2(action);
   const shouldEnable = action === "enable";
   const providerInfo = SOCIAL_PROVIDERS[provider];
-  const hasCustomOAuth = Boolean(options.clientId);
+  const hasOAuthOptions = hasCustomOAuthOptions(options);
+  if (hasOAuthOptions && !providerInfo.customOAuth) {
+    throw new InvalidInputError(`Custom OAuth options are only supported for providers with custom OAuth (e.g., google). Use: base44 auth social-login ${provider} ${action}`);
+  }
+  if (hasOAuthOptions && !shouldEnable) {
+    throw new InvalidInputError(`Custom OAuth options cannot be used with disable. To disable ${providerInfo.label} login: base44 auth social-login ${provider} disable`);
+  }
   const { project: project2 } = await readProjectConfig();
   const configDir = dirname10(project2.configPath);
   const authDir = join15(configDir, project2.authDir);
-  if (provider !== "google" && (options.clientId || options.clientSecret || options.clientSecretStdin)) {
-    throw new InvalidInputError(`Custom OAuth options are only supported for Google. Use: base44 auth social-login ${provider} ${action}`);
-  }
-  if (provider === "google" && !shouldEnable && hasCustomOAuth) {
-    throw new InvalidInputError("Custom OAuth options cannot be used with disable. To disable Google login: base44 auth social-login google disable");
-  }
+  const useCustomOAuth = shouldEnable && hasOAuthOptions && providerInfo.customOAuth;
   let clientSecret;
-  if (provider === "google" && shouldEnable && hasCustomOAuth) {
+  if (useCustomOAuth) {
+    const oauth = providerInfo.customOAuth;
     clientSecret = await resolveSecret({
       flagValue: options.clientSecret,
       fromStdin: options.clientSecretStdin,
-      envVar: "BASE44_GOOGLE_CLIENT_SECRET",
-      promptMessage: "Enter Google OAuth client secret",
+      envVar: oauth.envVar,
+      promptMessage: oauth.promptMessage,
       isNonInteractive,
       name: "client secret",
       hints: [
         {
-          message: "Provide via flag:   base44 auth social-login google enable --client-id <id> --client-secret <secret>",
-          command: "base44 auth social-login google enable --client-id <id> --client-secret <secret>"
+          message: `Provide via flag:   base44 auth social-login ${provider} enable --client-id <id> --client-secret <secret>`,
+          command: `base44 auth social-login ${provider} enable --client-id <id> --client-secret <secret>`
         },
         {
-          message: "Provide via stdin:  echo <secret> | base44 auth social-login google enable --client-id <id> --client-secret-stdin"
+          message: `Provide via stdin:  echo <secret> | base44 auth social-login ${provider} enable --client-id <id> --client-secret-stdin`
         },
         {
-          message: "Provide via env:    BASE44_GOOGLE_CLIENT_SECRET=<secret> base44 auth social-login google enable --client-id <id>"
+          message: `Provide via env:    ${oauth.envVar}=<secret> base44 auth social-login ${provider} enable --client-id <id>`
         }
       ]
     });
@@ -250904,38 +250874,40 @@ async function socialLoginAction({ log, isNonInteractive }, provider, action, op
       ...current,
       [providerInfo.field]: shouldEnable
     };
-    if (provider === "google" && shouldEnable) {
-      if (hasCustomOAuth) {
-        merged.googleOAuthMode = "custom";
-        merged.googleOAuthClientId = options.clientId;
+    if (providerInfo.customOAuth) {
+      const oauth = providerInfo.customOAuth;
+      if (useCustomOAuth) {
+        merged[oauth.modeField] = "custom";
+        merged[oauth.clientIdField] = options.clientId;
       } else {
-        merged.googleOAuthMode = "default";
-        merged.googleOAuthClientId = null;
+        merged[oauth.modeField] = "default";
+        merged[oauth.clientIdField] = null;
       }
     }
-    if (provider === "google" && !shouldEnable) {
-      merged.googleOAuthMode = "default";
-      merged.googleOAuthClientId = null;
-    }
     await writeAuthConfig(authDir, merged);
     return merged;
   });
-  if (clientSecret) {
+  if (clientSecret && providerInfo.customOAuth) {
     await runTask("Saving client secret", async () => {
-      await setSecrets({ google_oauth_client_secret: clientSecret });
+      await setSecrets({
+        [providerInfo.customOAuth.secretKey]: clientSecret
+      });
     });
   }
   if (!shouldEnable && !hasAnyLoginMethod(updated)) {
     log.warn(`Disabling ${providerInfo.label} login will leave no login methods enabled. Users will be locked out.`);
   }
   const newStatus = shouldEnable ? "enabled" : "disabled";
-  const oauthNote = provider === "google" && shouldEnable && hasCustomOAuth ? " with custom OAuth" : "";
+  const oauthNote = useCustomOAuth ? " with custom OAuth" : "";
   return {
     outroMessage: `${providerInfo.label} login ${newStatus}${oauthNote} in local config. Run \`base44 auth push\` or \`base44 deploy\` to apply.`
   };
 }
 function getSocialLoginCommand() {
-  return new Base44Command("social-login").description("Enable or disable social login providers (google, microsoft, facebook, apple)").argument("<provider>", "social login provider (google, microsoft, facebook, apple)").argument("<enable|disable>", "enable or disable the provider").option("--client-id <id>", "Google OAuth client ID (enables custom OAuth mode)").option("--client-secret <secret>", "Google OAuth client secret").option("--client-secret-stdin", "Read client secret from stdin").action(socialLoginAction);
+  return new Base44Command("social-login").description("Enable or disable social login providers (google, microsoft, facebook, apple)").addArgument(new Argument("<provider>", "social login provider").choices(VALID_PROVIDERS)).addArgument(new Argument("<action>", "enable or disable the provider").choices([
+    "enable",
+    "disable"
+  ])).option("--client-id <id>", "custom OAuth client ID (supported providers: google)").option("--client-secret <secret>", "custom OAuth client secret").option("--client-secret-stdin", "Read client secret from stdin").action(socialLoginAction);
 }
 
 // src/cli/commands/auth/index.ts
@@ -256091,7 +256063,7 @@ function createProgram(context) {
   program2.addCommand(getConnectorsCommand());
   program2.addCommand(getFunctionsCommand());
   program2.addCommand(getSecretsCommand());
-  program2.addCommand(getAuthCommand(), { hidden: true });
+  program2.addCommand(getAuthCommand());
   program2.addCommand(getSiteCommand());
   program2.addCommand(getTypesCommand());
   program2.addCommand(getExecCommand());
@@ -260340,4 +260312,4 @@ export {
   CLIExitError
 };
 
-//# debugId=598E133C9D56418664756E2164756E21
+//# debugId=BD7CF0B997F9C7CF64756E2164756E21