@lightdash/cli 0.2181.0 → 0.2182.0

package/dist/handlers/login.d.ts

@@ -1,13 +1,11 @@
 type LoginOptions = {
     /** Associated with a Personal Access Token or Service Account Token */
     token?: string;
-    /** Use OAuth2 flow instead of password/token */
-    oauth?: boolean;
     /** Project UUID to select after login */
     project?: string;
     interactive?: boolean;
     verbose: boolean;
 };
-export declare const login: (url: string, options: LoginOptions) => Promise<void>;
+export declare const login: (urlInput: string | undefined, options: LoginOptions) => Promise<void>;
 export {};
 //# sourceMappingURL=login.d.ts.map

package/dist/handlers/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/handlers/login.ts"],"names":[],"mappings":"AAcA,KAAK,YAAY,GAAG;IAChB,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AA+FF,eAAO,MAAM,KAAK,QAAe,MAAM,WAAW,YAAY,kBAmF7D,CAAC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/handlers/login.ts"],"names":[],"mappings":"AAiBA,KAAK,YAAY,GAAG;IAChB,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAqEF,eAAO,MAAM,KAAK,aACJ,MAAM,GAAG,SAAS,WACnB,YAAY,kBAgHxB,CAAC"}

package/dist/handlers/login.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.login = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const url_1 = require("url");
 const analytics_1 = require("../analytics/analytics");
@@ -11,17 +10,46 @@ const config_1 = require("../config");
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
 const styles = tslib_1.__importStar(require("../styles"));
 const apiClient_1 = require("./dbt/apiClient");
-const pat_1 = require("./login/pat");
 const oauthLogin_1 = require("./oauthLogin");
 const setProject_1 = require("./setProject");
 const utils_1 = require("./utils");
+/**
+ * Normalizes a URL input to make it more user-friendly:
+ * - Single words (e.g., "app") become subdomains of lightdash.cloud (e.g., "https://app.lightdash.cloud")
+ * - Missing protocol defaults to https://
+ * - Any path is stripped (e.g., "https://app.lightdash.cloud/projects/123" -> "https://app.lightdash.cloud")
+ * - Preserves explicitly provided protocols (http:// or https://)
+ *
+ * @param input - The URL input from the user
+ * @returns Normalized URL with protocol and host only
+ *
+ * @example
+ * normalizeUrl("app") // "https://app.lightdash.cloud"
+ * normalizeUrl("app.lightdash.cloud") // "https://app.lightdash.cloud"
+ * normalizeUrl("https://app.lightdash.cloud/projects/123") // "https://app.lightdash.cloud"
+ * normalizeUrl("http://localhost:3000") // "http://localhost:3000"
+ * normalizeUrl("custom.domain.com") // "https://custom.domain.com"
+ */
+const normalizeUrl = (input) => {
+    let url = input.trim();
+    // If it's a single word (no dots, slashes, or colons), assume it's a lightdash.cloud subdomain
+    if (!url.includes('/') && !url.includes('.') && !url.includes(':')) {
+        url = `${url}.lightdash.cloud`;
+    }
+    // If no protocol is specified, add https://
+    if (!url.match(/^https?:\/\//)) {
+        url = `https://${url}`;
+    }
+    // Parse the URL to extract protocol, hostname, and port (strips path)
+    const parsedUrl = new url_1.URL(url);
+    // Return only protocol + host (host includes hostname and port)
+    return `${parsedUrl.protocol}//${parsedUrl.host}`;
+};
 // Helper function to determine login method
 const getLoginMethod = (options) => {
-    if (options.oauth)
-        return 'oauth';
     if (options.token)
         return 'token';
-    return 'password';
+    return 'oauth';
 };
 const loginWithToken = async (url, token) => {
     const userInfoUrl = new url_1.URL(`/api/v1/user`, url).href;
@@ -40,56 +68,27 @@ const loginWithToken = async (url, token) => {
         token,
     };
 };
-const loginWithPassword = async (url) => {
-    const answers = await inquirer_1.default.prompt([
-        {
-            type: 'input',
-            name: 'email',
-        },
-        {
-            type: 'password',
-            name: 'password',
-        },
-    ]);
-    const { email, password } = answers;
-    const loginUrl = new url_1.URL(`/api/v1/login`, url).href;
-    const response = await (0, node_fetch_1.default)(loginUrl, {
-        method: 'POST',
-        body: JSON.stringify({ email, password }),
-        headers: {
-            'Content-Type': 'application/json',
-        },
-    });
-    globalState_1.default.debug(`> Login response status: ${response.status}`);
-    switch (response.status) {
-        case 200:
-            break;
-        case 401:
-            throw new common_1.AuthorizationError(`Unable to authenticate: invalid email or password`);
-        default:
-            // This error doesn't return a valid JSON, so we use .text instead
-            throw new common_1.AuthorizationError(`Unable to authenticate: (${response.status}) ${await response.text()}\nIf you use single sign-on (SSO) in the browser, login with a personal access token.`);
-    }
-    const loginBody = await response.json();
-    const header = response.headers.get('set-cookie');
-    if (header === null) {
-        throw new common_1.AuthorizationError(`Cannot sign in:\n${JSON.stringify(loginBody)}`);
-    }
-    const { userUuid, organizationUuid } = loginBody.results;
-    const cookie = header.split(';')[0].split('=')[1];
-    const patToken = await (0, pat_1.generatePersonalAccessToken)({
-        Cookie: `connect.sid=${cookie}`,
-    }, url);
-    return {
-        userUuid,
-        organizationUuid,
-        token: patToken,
-    };
-};
-const login = async (url, options) => {
+const login = async (urlInput, options) => {
     globalState_1.default.setVerbose(options.verbose);
     await (0, apiClient_1.checkLightdashVersion)();
-    globalState_1.default.debug(`> Login URL: ${url}`);
+    // If no URL provided, try to use the saved URL from config
+    let resolvedUrlInput = urlInput;
+    if (!resolvedUrlInput) {
+        const config = await (0, config_1.getConfig)();
+        if (config.context?.serverUrl) {
+            resolvedUrlInput = config.context.serverUrl;
+            console.error(`${styles.secondary(`Using saved URL: ${resolvedUrlInput}`)}`);
+        }
+        else {
+            throw new common_1.AuthorizationError(`No URL provided and no saved URL found. Please provide a URL:\n\n  ${styles.bold('⚡️ lightdash login <url>')}\n\nExamples:\n  ${styles.bold('⚡️ lightdash login app')} ${styles.secondary('(for https://app.lightdash.cloud)')}\n  ${styles.bold('⚡️ lightdash login https://custom.domain.com')}`);
+        }
+    }
+    // Normalize the URL input to handle various formats
+    const url = normalizeUrl(resolvedUrlInput);
+    if (urlInput) {
+        globalState_1.default.debug(`> Original URL input: ${urlInput}`);
+    }
+    globalState_1.default.debug(`> Normalized URL: ${url}`);
     const loginMethod = getLoginMethod(options);
     await analytics_1.LightdashAnalytics.track({
         event: 'login.started',
@@ -103,14 +102,11 @@ const login = async (url, options) => {
         console.error(`\n${styles.title('Warning')}: Login URL ${styles.secondary(url)} does not match a valid cloud server, perhaps you meant ${styles.secondary(cloudServer)} ?\n`);
     }
     let loginResult;
-    if (options.oauth) {
-        loginResult = await (0, oauthLogin_1.loginWithOauth)(url);
-    }
-    else if (options.token) {
+    if (options.token) {
         loginResult = await loginWithToken(url, options.token);
     }
     else {
-        loginResult = await loginWithPassword(url);
+        loginResult = await (0, oauthLogin_1.loginWithOauth)(url);
     }
     const { userUuid, token, organizationUuid } = loginResult;
     globalState_1.default.debug(`> Logged in with userUuid: ${userUuid}`);

package/dist/index.js

@@ -75,19 +75,20 @@ ${styles.bold('Examples:')}
 `);
 // LOGIN
 commander_1.program
-    .command('login <url>')
+    .command('login [url]')
     .description('Logs in to a Lightdash instance')
-    .description('Logs in to a Lightdash instance.\n\n👀 See https://docs.lightdash.com/guides/cli/cli-authentication for more help and examples')
+    .description('Logs in to a Lightdash instance using OAuth2 (opens browser). Use --token to bypass OAuth.\n\nURL is optional - if not provided, uses the last URL you logged into. URL can be flexible: single words like "app" become "https://app.lightdash.cloud", protocol defaults to https, and paths are ignored.\n\n👀 See https://docs.lightdash.com/guides/cli/cli-authentication for more help and examples')
     .addHelpText('after', `
 ${styles.bold('Examples:')}
-  ${styles.title('⚡')}️lightdash ${styles.bold('login')} https://app.lightdash.cloud ${styles.secondary('-- Logs in to Lightdash Cloud US instance')}
-  ${styles.title('⚡')}️lightdash ${styles.bold('login')} https://eu1.lightdash.cloud ${styles.secondary('-- Logs in to Lightdash Cloud EU instance')}
-  ${styles.title('⚡')}️lightdash ${styles.bold('login')} https://custom.lightdash.domain ${styles.secondary('-- Logs in to a self-hosted instance at a custom domain')}
-  ${styles.title('⚡')}️lightdash ${styles.bold('login')} https://custom.lightdash.domain --token 12345 ${styles.secondary('-- Logs in with an API access token (useful for users that use SSO in the browser)')}
-  ${styles.title('⚡')}️lightdash ${styles.bold('login')} https://custom.lightdash.domain --oauth ${styles.secondary('-- Logs in using OAuth2 flow (opens browser for authentication)')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} ${styles.secondary('-- Uses previously saved URL (opens browser for OAuth)')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} app ${styles.secondary('-- Short form for https://app.lightdash.cloud (opens browser for OAuth)')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} eu1 ${styles.secondary('-- Short form for https://eu1.lightdash.cloud (opens browser for OAuth)')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} app.lightdash.cloud ${styles.secondary('-- Adds https:// automatically (opens browser for OAuth)')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} https://custom.lightdash.domain/projects/123 ${styles.secondary('-- Strips path, uses https://custom.lightdash.domain (opens browser for OAuth)')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} http://localhost:3000 ${styles.secondary('-- Preserves http protocol for local development')}
+  ${styles.title('⚡')}️lightdash ${styles.bold('login')} --token 12345 ${styles.secondary('-- Logs in with API token using saved URL (bypasses OAuth)')}
 `)
     .option('--token <token>', 'Login with an API access token', undefined)
-    .option('--oauth', 'Login using OAuth2 flow (opens browser for authentication)', false)
     .option('--project <project uuid>', 'Select a project by UUID after login', parseProjectArgument, undefined)
     .option('--verbose', undefined, false)
     .action(login_1.login);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/cli",
-  "version": "0.2181.0",
+  "version": "0.2182.0",
   "license": "MIT",
   "bin": {
     "lightdash": "dist/index.js"
@@ -24,7 +24,7 @@
     "execa": "^5",
     "google-auth-library": "^8.5.1",
     "inquirer": "^8.2.4",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "lodash": "^4.17.21",
     "node-fetch": "^2.7.0",
     "nunjucks": "^3.2.3",
@@ -33,8 +33,8 @@
     "parse-node-version": "^2.0.0",
     "unique-names-generator": "^4.7.1",
     "uuid": "^11.0.3",
-    "@lightdash/common": "0.2181.0",
-    "@lightdash/warehouses": "0.2181.0"
+    "@lightdash/common": "0.2182.0",
+    "@lightdash/warehouses": "0.2182.0"
   },
   "description": "Lightdash CLI tool",
   "devDependencies": {