@lightdash/cli 3.86.0 → 3.88.0

package/dist/agentConnections/agentTokenProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentTokenProvider.d.ts","sourceRoot":"","sources":["../../src/agentConnections/agentTokenProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,KAAK,OAAO,EAAE,MAAM,UAAU,CAAC;AAEhF,OAAO,EAAE,oBAAoB,EAAoB,MAAM,SAAS,CAAC;AAyDjE,eAAO,MAAM,gBAAgB,SACnB,mBAAmB,OACpB,MAAM,KACZ,IAsCF,CAAC;AAEF,qBAAa,kBAAkB;IAIvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAH1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAE9C,YACqB,KAAK,GAAE,oBAAiD,EACzE;YAEU,MAAM;YA+DN,SAAS;IAkBjB,QAAQ,CACV,GAAG,EAAE,OAAO,EACZ,kBAAkB,GAAE,MAAM,GAAG,IAAW,EACxC,kBAAkB,GAAE,MAAM,GAAG,IAAW,GACzC,OAAO,CAAC,mBAAmB,CAAC,CAsL9B;IACK,iBAAiB,CACnB,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,OAAO,aAAa,EAAE,kBAAkB,EACnD,kBAAkB,EAAE,MAAM,GAAG,IAAI,EACjC,kBAAkB,EAAE,MAAM,GAAG,IAAI,GAClC,OAAO,CAAC,mBAAmB,CAAC,CA0B9B;CACJ"}
+{"version":3,"file":"agentTokenProvider.d.ts","sourceRoot":"","sources":["../../src/agentConnections/agentTokenProvider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,KAAK,mBAAmB,EAAE,KAAK,OAAO,EAAE,MAAM,UAAU,CAAC;AAEhF,OAAO,EAAE,oBAAoB,EAAoB,MAAM,SAAS,CAAC;AAyDjE,eAAO,MAAM,gBAAgB,SACnB,mBAAmB,OACpB,MAAM,KACZ,IAsCF,CAAC;AAEF,qBAAa,kBAAkB;IAIvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAH1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAE9C,YACqB,KAAK,GAAE,oBAAiD,EACzE;YAEU,MAAM;YA+DN,SAAS;IAkBjB,QAAQ,CACV,GAAG,EAAE,OAAO,EACZ,kBAAkB,GAAE,MAAM,GAAG,IAAW,EACxC,kBAAkB,GAAE,MAAM,GAAG,IAAW,GACzC,OAAO,CAAC,mBAAmB,CAAC,CAwL9B;IACK,iBAAiB,CACnB,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,OAAO,aAAa,EAAE,kBAAkB,EACnD,kBAAkB,EAAE,MAAM,GAAG,IAAI,EACjC,kBAAkB,EAAE,MAAM,GAAG,IAAI,GAClC,OAAO,CAAC,mBAAmB,CAAC,CA0B9B;CACJ"}

package/dist/agentConnections/agentTokenProvider.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const ajv_1 = tslib_1.__importDefault(require("ajv"));
 const crypto_1 = require("crypto");
+const env_1 = require("../env");
 const apiUrl_1 = require("./apiUrl");
 const schema_1 = require("./schema");
 const statusResponse_1 = require("./statusResponse");
@@ -205,11 +206,14 @@ class AgentTokenProvider {
                         body,
                         redirect: 'error',
                         signal: AbortSignal.timeout(15_000),
-                        headers: proxyAuthorization === null
-                            ? {}
-                            : {
-                                'Proxy-Authorization': proxyAuthorization,
-                            },
+                        headers: {
+                            'User-Agent': `lightdash-cli/${env_1.CLI_VERSION}`,
+                            ...(proxyAuthorization === null
+                                ? {}
+                                : {
+                                    'Proxy-Authorization': proxyAuthorization,
+                                }),
+                        },
                     });
                     if (!response.ok)
                         throw reconnectError();

package/dist/agentConnections/commandPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandPolicy.d.ts","sourceRoot":"","sources":["../../src/agentConnections/commandPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOzC,KAAK,aAAa,GACZ;IAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,WAAW,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAcjE,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CA6DlE,CAAC;AAqBF,eAAO,MAAM,yBAAyB,SAC5B,MAAM,YACH,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAC3C,IA6BF,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,OAAO,KAAG,MASnD,CAAC"}
+{"version":3,"file":"commandPolicy.d.ts","sourceRoot":"","sources":["../../src/agentConnections/commandPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOzC,KAAK,aAAa,GACZ;IAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,WAAW,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAcjE,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CA8DlE,CAAC;AAqBF,eAAO,MAAM,yBAAyB,SAC5B,MAAM,YACH,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAC3C,IA6BF,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,OAAO,KAAG,MASnD,CAAC"}

package/dist/agentConnections/commandPolicy.js

@@ -15,6 +15,7 @@ exports.COMMAND_POLICY = {
     'upgrade-check': local('Public release index only'),
     'connect-snowflake': refuse('Separate warehouse credential deposit'),
     login: refuse('Personal bootstrap', credentials_1.personalLoginRequired),
+    logout: refuse('Personal session logout', credentials_1.personalLoginRequired),
     agent: local('Command group'),
     'agent connect': refuse('Personal bootstrap', credentials_1.personalLoginRequired),
     'agent status': admit('Own connection status'),

package/dist/agentConnections/initialToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialToken.d.ts","sourceRoot":"","sources":["../../src/agentConnections/initialToken.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB,qGACwE,CAAC;AACvG,qBAAa,oBAAqB,SAAQ,KAAK;IAC3C,YAAY,OAAO,SAAoB,EAEtC;CACJ;AACD,eAAO,MAAM,8BAA8B,yFAQxC;IACC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;;;;;QA2EW,WAAW;QACX,YAAY;QACZ,oBAAoB;QAGpB,qBAAqB;QAGrB,MAAM;QACN,UAAU;QACV,sBAAsB;;EAGjC,CAAC"}
+{"version":3,"file":"initialToken.d.ts","sourceRoot":"","sources":["../../src/agentConnections/initialToken.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB,qGACwE,CAAC;AACvG,qBAAa,oBAAqB,SAAQ,KAAK;IAC3C,YAAY,OAAO,SAAoB,EAEtC;CACJ;AACD,eAAO,MAAM,8BAA8B,yFAQxC;IACC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,WAAW,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;;;;;QA4EW,WAAW;QACX,YAAY;QACZ,oBAAoB;QAGpB,qBAAqB;QAGrB,MAAM;QACN,UAAU;QACV,sBAAsB;;EAGjC,CAAC"}

package/dist/agentConnections/initialToken.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exchangeInitialConnectionToken = exports.ConnectionProofError = exports.unboundConnection = void 0;
 const uuid_1 = require("uuid");
+const env_1 = require("../env");
 const apiUrl_1 = require("./apiUrl");
 const approvedProjectProof_1 = require("./approvedProjectProof");
 const statusResponse_1 = require("./statusResponse");
@@ -19,6 +20,7 @@ const exchangeInitialConnectionToken = async ({ instanceUrl, code, verifier, red
         method: 'POST',
         headers: {
             'Content-Type': 'application/x-www-form-urlencoded',
+            'User-Agent': `lightdash-cli/${env_1.CLI_VERSION}`,
             ...(proxyAuthorization === null
                 ? {}
                 : { 'Proxy-Authorization': proxyAuthorization }),

package/dist/agentConnections/personalRecovery.js

@@ -11,7 +11,7 @@ const statusResponse_1 = require("./statusResponse");
 class PersonalRecoveryError extends Error {
     constructor(mode = 'recovery') {
         super(mode === 'bootstrap'
-            ? 'Agent connection approval requires a personal CLI login. Service account credentials cannot start approval.'
+            ? 'Agent connection approval needs a personal access token login. Run `lightdash login <url> --token <personal access token>` and retry. Browser logins and service account credentials cannot start approval.'
             : 'The personal CLI login does not match this connection person and organisation.');
     }
 }

package/dist/analytics/analytics.js

@@ -30,7 +30,7 @@ const detectCI = () => {
 const identifyUser = async () => {
     (0, credentials_1.refuseAgentConnection)();
     const config = await (0, config_1.getConfig)();
-    if (config.context?.serverUrl && config.context.apiKey) {
+    if (config.context?.serverUrl) {
         try {
             const user = await (0, apiClient_1.lightdashApi)({
                 method: 'GET',

package/dist/config.d.ts

@@ -28,6 +28,7 @@ export type Config = {
 export declare const ensureConfigFilePermissions: (filePath: string) => Promise<void>;
 /** @internal Exported for filesystem-permission regression tests. */
 export declare const writeConfigToFile: (filePath: string, config: Config) => Promise<void>;
+export declare const getRawConfig: () => Promise<Config>;
 export declare const getConfig: ({ readOnly, }?: {
     readOnly?: boolean;
 }) => Promise<Config>;
@@ -39,4 +40,5 @@ export declare const unsetPreviewProject: () => Promise<void>;
 export declare const setDefaultUser: (userUuid: string, organizationUuid: string) => Promise<void>;
 export declare const setContext: (context: Config['context']) => Promise<void>;
 export declare const setAnswer: (answer: Config['answers']) => Promise<void>;
+export declare const unsetApiKey: () => Promise<void>;
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,QAAsC,CAAC;AAElE,MAAM,MAAM,MAAM,GAAG;IACjB,IAAI,CAAC,EAAE;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;IACF,OAAO,CAAC,EAAE;QACN,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,OAAO,CAAC,EAAE;QACN,qCAAqC,CAAC,EAAE,OAAO,CAAC;QAChD,gCAAgC,CAAC,EAAE,OAAO,CAAC;KAC9C,CAAC;CACL,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,2BAA2B,aAC1B,MAAM,KACjB,OAAO,CAAC,IAAI,CAgBd,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,aAChB,MAAM,UACR,MAAM,KACf,OAAO,CAAC,IAAI,CAed,CAAC;AAqCF,eAAO,MAAM,SAAS,mBAEnB;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,OAAO,CAAC,MAAM,CA6B9C,CAAC;AAEF,eAAO,MAAM,UAAU,gBAAuB,MAAM,eAAe,MAAM,kBAcxE,CAAC;AAEF,eAAO,MAAM,YAAY,qBAWxB,CAAC;AAEF,eAAO,MAAM,SAAS,WAAkB,MAAM,kBAS7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBAAuB,MAAM,QAAQ,MAAM,kBAUxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,qBAU/B,CAAC;AAEF,eAAO,MAAM,cAAc,aACb,MAAM,oBACE,MAAM,kBAW3B,CAAC;AAEF,eAAO,MAAM,UAAU,YAAmB,MAAM,CAAC,SAAS,CAAC,kBAM1D,CAAC;AAEF,eAAO,MAAM,SAAS,WAAkB,MAAM,CAAC,SAAS,CAAC,kBAMxD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,QAAsC,CAAC;AAElE,MAAM,MAAM,MAAM,GAAG;IACjB,IAAI,CAAC,EAAE;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;IACF,OAAO,CAAC,EAAE;QACN,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,OAAO,CAAC,EAAE;QACN,qCAAqC,CAAC,EAAE,OAAO,CAAC;QAChD,gCAAgC,CAAC,EAAE,OAAO,CAAC;KAC9C,CAAC;CACL,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,2BAA2B,aAC1B,MAAM,KACjB,OAAO,CAAC,IAAI,CAgBd,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,aAChB,MAAM,UACR,MAAM,KACf,OAAO,CAAC,IAAI,CAed,CAAC;AAMF,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,MAAM,CAgBnD,CAAC;AAeF,eAAO,MAAM,SAAS,mBAEnB;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,OAAO,CAAC,MAAM,CA6B9C,CAAC;AAEF,eAAO,MAAM,UAAU,gBAAuB,MAAM,eAAe,MAAM,kBAcxE,CAAC;AAEF,eAAO,MAAM,YAAY,qBAWxB,CAAC;AAEF,eAAO,MAAM,SAAS,WAAkB,MAAM,kBAS7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBAAuB,MAAM,QAAQ,MAAM,kBAUxE,CAAC;AAEF,eAAO,MAAM,mBAAmB,qBAU/B,CAAC;AAEF,eAAO,MAAM,cAAc,aACb,MAAM,oBACE,MAAM,kBAW3B,CAAC;AAEF,eAAO,MAAM,UAAU,YAAmB,MAAM,CAAC,SAAS,CAAC,kBAM1D,CAAC;AAEF,eAAO,MAAM,SAAS,WAAkB,MAAM,CAAC,SAAS,CAAC,kBAMxD,CAAC;AAEF,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,IAAI,CAIhD,CAAC"}

package/dist/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setAnswer = exports.setContext = exports.setDefaultUser = exports.unsetPreviewProject = exports.setPreviewProject = exports.setSource = exports.unsetProject = exports.setProject = exports.getConfig = exports.writeConfigToFile = exports.ensureConfigFilePermissions = exports.configFilePath = void 0;
+exports.unsetApiKey = exports.setAnswer = exports.setContext = exports.setDefaultUser = exports.unsetPreviewProject = exports.setPreviewProject = exports.setSource = exports.unsetProject = exports.setProject = exports.getConfig = exports.getRawConfig = exports.writeConfigToFile = exports.ensureConfigFilePermissions = exports.configFilePath = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const yaml = tslib_1.__importStar(require("js-yaml"));
@@ -63,8 +63,9 @@ const getRawConfig = async () => {
         throw e;
     }
 };
+exports.getRawConfig = getRawConfig;
 const setAnonymousUuid = async (anonymousUuid) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     const newConfig = {
         ...config,
         user: {
@@ -76,7 +77,7 @@ const setAnonymousUuid = async (anonymousUuid) => {
     return newConfig;
 };
 const getConfig = async ({ readOnly = false, } = {}) => {
-    let rawConfig = await getRawConfig();
+    let rawConfig = await (0, exports.getRawConfig)();
     if (!readOnly && rawConfig.user?.anonymousUuid === undefined) {
         rawConfig = await setAnonymousUuid((0, uuid_1.v4)());
     }
@@ -102,7 +103,7 @@ const getConfig = async ({ readOnly = false, } = {}) => {
 };
 exports.getConfig = getConfig;
 const setProject = async (projectUuid, projectName) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         context: {
@@ -117,7 +118,7 @@ const setProject = async (projectUuid, projectName) => {
 };
 exports.setProject = setProject;
 const unsetProject = async () => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         context: {
@@ -130,7 +131,7 @@ const unsetProject = async () => {
 };
 exports.unsetProject = unsetProject;
 const setSource = async (source) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         context: {
@@ -141,7 +142,7 @@ const setSource = async (source) => {
 };
 exports.setSource = setSource;
 const setPreviewProject = async (projectUuid, name) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         context: {
@@ -153,7 +154,7 @@ const setPreviewProject = async (projectUuid, name) => {
 };
 exports.setPreviewProject = setPreviewProject;
 const unsetPreviewProject = async () => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         context: {
@@ -165,7 +166,7 @@ const unsetPreviewProject = async () => {
 };
 exports.unsetPreviewProject = unsetPreviewProject;
 const setDefaultUser = async (userUuid, organizationUuid) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         user: {
@@ -177,7 +178,7 @@ const setDefaultUser = async (userUuid, organizationUuid) => {
 };
 exports.setDefaultUser = setDefaultUser;
 const setContext = async (context) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         context,
@@ -185,10 +186,17 @@ const setContext = async (context) => {
 };
 exports.setContext = setContext;
 const setAnswer = async (answer) => {
-    const config = await getRawConfig();
+    const config = await (0, exports.getRawConfig)();
     await setConfig({
         ...config,
         answers: lodash_1.default.merge(config.answers, answer),
     });
 };
 exports.setAnswer = setAnswer;
+const unsetApiKey = async () => {
+    const config = await (0, exports.getRawConfig)();
+    if (config.context)
+        delete config.context.apiKey;
+    await setConfig(config);
+};
+exports.unsetApiKey = unsetApiKey;

package/dist/credentials.d.ts

@@ -2,12 +2,17 @@ import { type AgentTokenProvider } from './agentConnections/agentTokenProvider';
 import { type LifecycleOperation } from './agentConnections/lifecycle';
 import { type AgentConnectionSlot } from './agentConnections/schema';
 import { type Config } from './config';
+import { type PersonalLogin } from './personalLogin/schema';
 export type Credential = {
     kind: 'human_api_key';
     token: string;
 } | {
     kind: 'service_account';
     token: string;
+} | {
+    kind: 'personal_oauth';
+    token: string;
+    login: PersonalLogin;
 } | {
     kind: 'agent_connection';
     token: string;

package/dist/credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAO7E,eAAO,MAAM,wBAAwB,QAAO,IAK3C,CAAC;AAMF,eAAO,MAAM,gCAAgC,cAC9B,MAAM,GAAG,IAAI,KACzB,MAAM,GAAG,IASX,CAAC;AACF,eAAO,MAAM,qCAAqC,GAAI,CAAC,iBACpC,MAAM,MAAM,GAAG,IAAI,iBACnB,OAAO,UACd,MAAM,CAAC,KAChB,CAoDF,CAAC;AACF,eAAO,MAAM,2BAA2B,QAAO,MAAM,GAAG,IAQvD,CAAC;AACF,eAAO,MAAM,+BAA+B,GAAI,CAAC,aAClC,MAAM,GAAG,IAAI,UAChB,MAAM,CAAC,KAChB,CAQE,CAAC;AACN,eAAO,MAAM,eAAe,UAAW,MAAM,KAAG,UAK9C,CAAC;AACH,eAAO,MAAM,iBAAiB,WAClB,MAAM,aACJ,kBAAkB,GAAG,IAAI,uBACf,MAAM,GAAG,IAAI,cACtB,kBAAkB,GAAG,IAAI,KACrC,OAAO,CAAC,UAAU,CAyDpB,CAAC;AACF,eAAO,MAAM,qBAAqB,mHACkF,CAAC;AACrH,eAAO,MAAM,uBAAuB,+JAC4H,CAAC;AACjK,eAAO,MAAM,qBAAqB,8BAA2B,IAK5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,eAChC,MAAM,CAAC,UAAU,KAC7B,OAAO,CAAC,MAAM,CAAC,UAAU,CAqB3B,CAAC"}
+{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GAC/D;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAO7E,eAAO,MAAM,wBAAwB,QAAO,IAK3C,CAAC;AAMF,eAAO,MAAM,gCAAgC,cAC9B,MAAM,GAAG,IAAI,KACzB,MAAM,GAAG,IASX,CAAC;AACF,eAAO,MAAM,qCAAqC,GAAI,CAAC,iBACpC,MAAM,MAAM,GAAG,IAAI,iBACnB,OAAO,UACd,MAAM,CAAC,KAChB,CAoDF,CAAC;AACF,eAAO,MAAM,2BAA2B,QAAO,MAAM,GAAG,IAQvD,CAAC;AACF,eAAO,MAAM,+BAA+B,GAAI,CAAC,aAClC,MAAM,GAAG,IAAI,UAChB,MAAM,CAAC,KAChB,CAQE,CAAC;AACN,eAAO,MAAM,eAAe,UAAW,MAAM,KAAG,UAK9C,CAAC;AACH,eAAO,MAAM,iBAAiB,WAClB,MAAM,aACJ,kBAAkB,GAAG,IAAI,uBACf,MAAM,GAAG,IAAI,cACtB,kBAAkB,GAAG,IAAI,KACrC,OAAO,CAAC,UAAU,CAqEpB,CAAC;AACF,eAAO,MAAM,qBAAqB,mHACkF,CAAC;AACrH,eAAO,MAAM,uBAAuB,+JAC4H,CAAC;AACjK,eAAO,MAAM,qBAAqB,8BAA2B,IAK5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,eAChC,MAAM,CAAC,UAAU,KAC7B,OAAO,CAAC,MAAM,CAAC,UAAU,CAqB3B,CAAC"}

package/dist/credentials.js

@@ -101,9 +101,18 @@ const resolveCredential = async (config, provider = null, rejectedGeneration = n
     if (name === null) {
         if (lifecycle !== null)
             throw new Error('An agent connection selection is required.');
-        if (!(config.context?.apiKey && config.context.serverUrl))
+        if (!config.context?.serverUrl)
             throw new common_1.AuthorizationError(`Not logged in. Run 'lightdash login --help'`);
-        return (0, exports.humanCredential)(config.context.apiKey);
+        const { apiKey } = config.context;
+        if (apiKey)
+            return (0, exports.humanCredential)(apiKey);
+        const { PersonalLoginTokenProvider } = await Promise.resolve().then(() => tslib_1.__importStar(require('./personalLogin/tokenProvider')));
+        const login = await new PersonalLoginTokenProvider().getToken(config.context.serverUrl, rejectedGeneration);
+        return {
+            kind: 'personal_oauth',
+            token: login.tokens.accessToken,
+            login,
+        };
     }
     if (!config.context?.serverUrl ||
         !config.user?.userUuid ||

package/dist/handlers/apps/createApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createApp.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/createApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAQH,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACxB,MAAM,mBAAmB,CAAC;AAyB3B,MAAM,MAAM,uBAAuB,GAAG;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAKF,eAAO,MAAM,6BAA6B,EAAE,gBA4B3C,CAAC;AAEF,eAAO,MAAM,cAAc,UAAU,CAAC;AAEtC,eAAO,MAAM,iBAAiB,YAC1B,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,eAAe,EACf,OAAO,EACP,aAAa,EACb,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,UAAU,EACV,WAAW,CACL,CAAC;AAEX,eAAO,MAAM,mBAAmB,SACtB,MAAM,iBACG,MAAM,KACtB,MAWF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,IAAI,CAAC;IACV,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,KAAG,eAaF,CAAC;AAqLH,eAAO,MAAM,gBAAgB,SACnB,MAAM,WACH,uBAAuB,KACjC,OAAO,CAAC,IAAI,CA0Id,CAAC"}
+{"version":3,"file":"createApp.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/createApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACxB,MAAM,mBAAmB,CAAC;AAyB3B,MAAM,MAAM,uBAAuB,GAAG;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAKF,eAAO,MAAM,6BAA6B,EAAE,gBA4B3C,CAAC;AAEF,eAAO,MAAM,cAAc,UAAU,CAAC;AAEtC,eAAO,MAAM,iBAAiB,YAC1B,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,eAAe,EACf,OAAO,EACP,aAAa,EACb,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,UAAU,EACV,WAAW,CACL,CAAC;AAEX,eAAO,MAAM,mBAAmB,SACtB,MAAM,iBACG,MAAM,KACtB,MAWF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,IAAI,CAAC;IACV,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,KAAG,eAaF,CAAC;AAqLH,eAAO,MAAM,gBAAgB,SACnB,MAAM,WACH,uBAAuB,KACjC,OAAO,CAAC,IAAI,CAsId,CAAC"}

package/dist/handlers/apps/createApp.js

@@ -240,9 +240,7 @@ const createAppHandler = async (name, options) => {
         // user to approve any local package installation.
         await (0, apiClient_1.checkLightdashVersion)();
         const config = await (0, config_1.getConfig)();
-        if (!config.context?.apiKey || !config.context.serverUrl) {
-            throw new common_1.AuthorizationError(`Not logged in. Run 'lightdash login --help'`);
-        }
+        await (0, credentials_1.resolveCredential)(config);
         const projectSelection = await (0, selectProject_1.selectProject)(config, options.project);
         if (!projectSelection) {
             throw new common_1.LightdashError({

package/dist/handlers/apps/preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/preview.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAqB,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE/E;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,SAAU;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACjC,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CA+CxB,CAAC;AAEF,eAAO,MAAM,wBAAwB,SAAgB;IACjD,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,KAAG,OAAO,CAAC,MAAM,EAAE,CA8EnB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,WACtC,MAAM,KACf,OAAO,CAAC,IAAI,CAWd,CAAC;AAEF,eAAO,MAAM,oBAAoB,SAAgB;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CA2BlD,CAAC;AAQF,eAAO,MAAM,wBAAwB,WACzB,MAAM,KACf,OAAO,CAAC,IAAI,CAMd,CAAC;AAyBF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,SAAgB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;CACtB,KAAG,OAAO,CAAC,IAAI,CAwEf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,SAAU;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB,KAAG,MACgT,CAAC;AAErT,eAAO,MAAM,uBAAuB,SAAgB;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,KAAG,OAAO,CAAC,OAAO,CAoBlB,CAAC;AAKF,eAAO,MAAM,6BAA6B,WAC9B,MAAM,KACf,OAAO,CAAC,OAAO,CAmBjB,CAAC;AAkBF,KAAK,kBAAkB,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,sBAAsB,UACxB,qBAAqB,KAC7B,MA4BF,CAAC;AAEF,eAAO,MAAM,kBAAkB,QACtB,MAAM,GAAG,SAAS,KACxB,MAAM,GAAG,SASX,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAClB,MAAM,GAAG,SAAS,WAClB,kBAAkB,KAC5B,OAAO,CAAC,IAAI,CAiJd,CAAC"}
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/preview.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,mBAAmB,CAAC;AAkB3B,OAAO,EAAqB,KAAK,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE/E;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,SAAU;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACjC,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CA+CxB,CAAC;AAEF,eAAO,MAAM,wBAAwB,SAAgB;IACjD,QAAQ,EAAE,eAAe,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,KAAG,OAAO,CAAC,MAAM,EAAE,CA8EnB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,WACtC,MAAM,KACf,OAAO,CAAC,IAAI,CAWd,CAAC;AAEF,eAAO,MAAM,oBAAoB,SAAgB;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;CACf,KAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CA2BlD,CAAC;AAQF,eAAO,MAAM,wBAAwB,WACzB,MAAM,KACf,OAAO,CAAC,IAAI,CAMd,CAAC;AAyBF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,SAAgB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;CACtB,KAAG,OAAO,CAAC,IAAI,CAwEf,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,SAAU;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB,KAAG,MACgT,CAAC;AAErT,eAAO,MAAM,uBAAuB,SAAgB;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,KAAG,OAAO,CAAC,OAAO,CAoBlB,CAAC;AAKF,eAAO,MAAM,6BAA6B,WAC9B,MAAM,KACf,OAAO,CAAC,OAAO,CAmBjB,CAAC;AAkBF,KAAK,kBAAkB,GAAG;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,sBAAsB,UACxB,qBAAqB,KAC7B,MA4BF,CAAC;AAEF,eAAO,MAAM,kBAAkB,QACtB,MAAM,GAAG,SAAS,KACxB,MAAM,GAAG,SASX,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAClB,MAAM,GAAG,SAAS,WAClB,kBAAkB,KAC5B,OAAO,CAAC,IAAI,CAsJd,CAAC"}

package/dist/handlers/apps/preview.js

@@ -369,15 +369,16 @@ const appsPreviewHandler = async (pathArg, options) => {
     const devServerPort = (0, exports.resolvePreviewPort)(options.port);
     const config = await (0, config_1.getConfig)();
     const serverUrl = options.url ?? config.context?.serverUrl;
-    // getConfig() already folds LIGHTDASH_API_KEY into context.apiKey, so the
-    // env-var path is safe. The only exposure is an explicit --token on the
-    // command line (visible in shell history / `ps aux`) — warn rather than
-    // block, since --token is a supported CI path.
-    const apiKey = options.token ?? config.context?.apiKey;
-    if (!serverUrl || !apiKey) {
+    if (!serverUrl) {
         throw new common_1.AuthorizationError(`Not logged in or missing server URL. Run 'lightdash login <url>' first, or set LIGHTDASH_URL and LIGHTDASH_API_KEY.`);
     }
-    const authorization = (0, utils_1.getAuthHeader)(apiKey);
+    const resolveAuthorization = async () => (0, utils_1.getCredentialAuthHeader)(options.token
+        ? (0, credentials_1.humanCredential)(options.token)
+        : await (0, credentials_1.resolveCredential)({
+            ...config,
+            context: { ...config.context, serverUrl },
+        }));
+    const authorization = await resolveAuthorization();
     const proxyAuthorization = config.context?.proxyAuthorization;
     if (options.token) {
         globalState_1.default.log(styles.warning(`Passing --token on the command line exposes it in your shell history and process list. Prefer 'lightdash login' or the LIGHTDASH_API_KEY environment variable.`));
@@ -403,10 +404,10 @@ const appsPreviewHandler = async (pathArg, options) => {
     if (!options.url && !options.token) {
         await (0, apiClient_1.checkLightdashVersion)();
     }
-    const preflight = (apiPath) => (0, exports.preflightPreviewRequest)({
+    const preflight = async (apiPath) => (0, exports.preflightPreviewRequest)({
         apiPath,
         serverUrl,
-        authorization,
+        authorization: await resolveAuthorization(),
         proxyAuthorization,
     });
     if (!(await preflight('/api/v1/user'))) {
@@ -422,7 +423,7 @@ const appsPreviewHandler = async (pathArg, options) => {
         manifest,
         projectUuid: target.projectUuid,
         serverUrl,
-        authorization,
+        authorization: await resolveAuthorization(),
         proxyAuthorization,
     });
     // Previous versions persisted this credential in .env.local. Remove only
@@ -434,6 +435,7 @@ const appsPreviewHandler = async (pathArg, options) => {
     const proxy = await (0, previewProxy_1.startPreviewProxy)({
         upstreamUrl: serverUrl,
         authorization,
+        resolveAuthorization,
         proxyAuthorization,
         projectUuid: target.projectUuid,
         nonce: proxyNonce,

package/dist/handlers/apps/previewProxy.d.ts

@@ -22,6 +22,7 @@ export type CompiledQueryLogEntry = {
 export declare const startPreviewProxy: (args: {
     upstreamUrl: string;
     authorization: string;
+    resolveAuthorization?: () => Promise<string>;
     proxyAuthorization?: string;
     projectUuid: string;
     nonce: string;

package/dist/handlers/apps/previewProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"previewProxy.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/previewProxy.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,0BAA0B,8BAA8B,CAAC;AA6CtE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,4EAA4E;AAC5E,MAAM,MAAM,qBAAqB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAG5B,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACxC,CAAC;AAyCF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,SAAU;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IAGd,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;CAC5D,KAAG,OAAO,CAAC,kBAAkB,CAwU7B,CAAC"}
+{"version":3,"file":"previewProxy.d.ts","sourceRoot":"","sources":["../../../src/handlers/apps/previewProxy.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,0BAA0B,8BAA8B,CAAC;AA6CtE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,4EAA4E;AAC5E,MAAM,MAAM,qBAAqB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAG5B,0BAA0B,EAAE,MAAM,EAAE,CAAC;CACxC,CAAC;AAyCF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,SAAU;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IAGd,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;CAC5D,KAAG,OAAO,CAAC,kBAAkB,CAyW7B,CAAC"}

package/dist/handlers/apps/previewProxy.js

@@ -90,52 +90,68 @@ const startPreviewProxy = (args) => {
             : {}),
     });
     // Resolves the parsed body of a successful upstream GET, or null.
-    const getUpstreamJson = (path) => new Promise((resolve) => {
-        const upstreamReq = requestFn({
-            protocol: upstream.protocol,
-            hostname: upstream.hostname,
-            port: upstream.port || undefined,
-            path,
-            method: 'GET',
-            headers: withUpstreamCredentials({
-                accept: 'application/json',
-            }),
-        }, (upstreamRes) => {
-            readBody(upstreamRes).then((text) => {
-                const status = upstreamRes.statusCode ?? 502;
-                resolve(status >= 200 && status < 300
-                    ? parseJson(text)
-                    : null);
-            }, () => resolve(null));
+    const getUpstreamJson = async (path) => {
+        const authorization = args.resolveAuthorization
+            ? await args.resolveAuthorization()
+            : args.authorization;
+        return new Promise((resolve) => {
+            const upstreamReq = requestFn({
+                protocol: upstream.protocol,
+                hostname: upstream.hostname,
+                port: upstream.port || undefined,
+                path,
+                method: 'GET',
+                headers: {
+                    ...withUpstreamCredentials({
+                        accept: 'application/json',
+                    }),
+                    authorization,
+                },
+            }, (upstreamRes) => {
+                readBody(upstreamRes).then((text) => {
+                    const status = upstreamRes.statusCode ?? 502;
+                    resolve(status >= 200 && status < 300
+                        ? parseJson(text)
+                        : null);
+                }, () => resolve(null));
+            });
+            upstreamReq.on('error', () => resolve(null));
+            upstreamReq.end();
         });
-        upstreamReq.on('error', () => resolve(null));
-        upstreamReq.end();
-    });
+    };
     // Resolves the parsed body of a successful upstream POST, or null.
-    const postUpstreamJson = (path, body) => new Promise((resolve) => {
-        const payload = Buffer.from(body, 'utf-8');
-        const upstreamReq = requestFn({
-            protocol: upstream.protocol,
-            hostname: upstream.hostname,
-            port: upstream.port || undefined,
-            path,
-            method: 'POST',
-            headers: withUpstreamCredentials({
-                accept: 'application/json',
-                'content-type': 'application/json',
-                'content-length': payload.length,
-            }),
-        }, (upstreamRes) => {
-            readBody(upstreamRes).then((text) => {
-                const status = upstreamRes.statusCode ?? 502;
-                resolve(status >= 200 && status < 300
-                    ? parseJson(text)
-                    : null);
-            }, () => resolve(null));
+    const postUpstreamJson = async (path, body) => {
+        const authorization = args.resolveAuthorization
+            ? await args.resolveAuthorization()
+            : args.authorization;
+        return new Promise((resolve) => {
+            const payload = Buffer.from(body, 'utf-8');
+            const upstreamReq = requestFn({
+                protocol: upstream.protocol,
+                hostname: upstream.hostname,
+                port: upstream.port || undefined,
+                path,
+                method: 'POST',
+                headers: {
+                    ...withUpstreamCredentials({
+                        accept: 'application/json',
+                        'content-type': 'application/json',
+                        'content-length': payload.length,
+                    }),
+                    authorization,
+                },
+            }, (upstreamRes) => {
+                readBody(upstreamRes).then((text) => {
+                    const status = upstreamRes.statusCode ?? 502;
+                    resolve(status >= 200 && status < 300
+                        ? parseJson(text)
+                        : null);
+                }, () => resolve(null));
+            });
+            upstreamReq.on('error', () => resolve(null));
+            upstreamReq.end(payload);
         });
-        upstreamReq.on('error', () => resolve(null));
-        upstreamReq.end(payload);
-    });
+    };
     // --show-sql: compile the metric query the app just ran (same payload the
     // customer-facing compileQuery endpoint takes) and report the SQL.
     const compileAndReport = async (requestBody) => {
@@ -205,7 +221,7 @@ const startPreviewProxy = (args) => {
         res.writeHead(200, { 'content-type': 'application/json' });
         res.end(JSON.stringify({ status: 'ok', results }));
     };
-    const server = http.createServer((req, res) => {
+    const handleRequest = async (req, res) => {
         const method = req.method ?? 'GET';
         const nonceHeader = req.headers[exports.PREVIEW_PROXY_NONCE_HEADER];
         const browserAuthorization = req.headers.authorization;
@@ -243,6 +259,8 @@ const startPreviewProxy = (args) => {
             return;
         }
         const headers = withUpstreamCredentials(filterHeaders(req.headers, DROPPED_REQUEST_HEADERS));
+        if (args.resolveAuthorization)
+            headers.authorization = await args.resolveAuthorization();
         // The previewed app fetches the export's fileUrl directly from the
         // local dev page, which carries no instance credentials — ask the
         // backend for a SIGNED URL, same as the deployed app's bridge.
@@ -279,6 +297,14 @@ const startPreviewProxy = (args) => {
         else {
             req.pipe(upstreamReq);
         }
+    };
+    const server = http.createServer((req, res) => {
+        handleRequest(req, res).catch(() => {
+            if (!res.headersSent)
+                sendJsonError(res, 502, 'Preview proxy: could not authenticate the upstream request.');
+            else
+                res.destroy();
+        });
     });
     return new Promise((resolve, reject) => {
         server.once('error', reject);

package/dist/handlers/dbt/apiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiClient.d.ts","sourceRoot":"","sources":["../../../src/handlers/dbt/apiClient.ts"],"names":[],"mappings":"AACA,OAAO,EAGH,WAAW,EAIX,WAAW,EAEX,KAAK,6BAA6B,EAGrC,MAAM,mBAAmB,CAAC;AAC3B,OAAc,EAAE,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkB5D,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,KAAK,oBAAoB,GAAG,iBAAiB,GAAG;IAC5C,SAAS,CAAC,EAAE,OAAO,kCAAkC,EAAE,kBAAkB,CAAC;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAKF,eAAO,MAAM,cAAc,YAAa,OAAO,SAE9C,CAAC;AAqDF,eAAO,MAAM,eAAe,oFAQzB,oBAAoB,KAAG,OAAO,CAAC,QAAQ,CAyMzC,CAAC;AAEF,eAAO,MAAM,cAAc,aAAoB,QAAQ,KAAG,OAAO,CAAC,OAAO,CAsBxE,CAAC;AA6BF,eAAO,MAAM,YAAY,GAAU,CAAC,SAAS,WAAW,CAAC,SAAS,CAAC,+CAMhE,iBAAiB,KAAG,OAAO,CAAC,CAAC,CAsE/B,CAAC;AAEF,eAAO,MAAM,cAAc,QACb,OAAO,CAAC,6BAA6B,CAMzC,CAAC;AAEX,MAAM,MAAM,8BAA8B,GAAG;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,iCAAiC,gBAC7B,MAAM,KACpB,OAAO,CAAC,8BAA8B,CAiGxC,CAAC;AAEF,eAAO,MAAM,8BAA8B,wBAClB,MAAM,GAAG,SAAS,eAC1B,WAAW,KACzB,OAAO,CAAC,IAAI,CA+Gd,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,IAAI,CA8C1D,CAAC"}
+{"version":3,"file":"apiClient.d.ts","sourceRoot":"","sources":["../../../src/handlers/dbt/apiClient.ts"],"names":[],"mappings":"AACA,OAAO,EAGH,WAAW,EAIX,WAAW,EAEX,KAAK,6BAA6B,EAGrC,MAAM,mBAAmB,CAAC;AAC3B,OAAc,EAAE,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkB5D,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,KAAK,oBAAoB,GAAG,iBAAiB,GAAG;IAC5C,SAAS,CAAC,EAAE,OAAO,kCAAkC,EAAE,kBAAkB,CAAC;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAKF,eAAO,MAAM,cAAc,YAAa,OAAO,SAE9C,CAAC;AAqDF,eAAO,MAAM,eAAe,oFAQzB,oBAAoB,KAAG,OAAO,CAAC,QAAQ,CA6NzC,CAAC;AAEF,eAAO,MAAM,cAAc,aAAoB,QAAQ,KAAG,OAAO,CAAC,OAAO,CAsBxE,CAAC;AA6BF,eAAO,MAAM,YAAY,GAAU,CAAC,SAAS,WAAW,CAAC,SAAS,CAAC,+CAMhE,iBAAiB,KAAG,OAAO,CAAC,CAAC,CAiE/B,CAAC;AAEF,eAAO,MAAM,cAAc,QACb,OAAO,CAAC,6BAA6B,CAMzC,CAAC;AAEX,MAAM,MAAM,8BAA8B,GAAG;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,iCAAiC,gBAC7B,MAAM,KACpB,OAAO,CAAC,8BAA8B,CAiGxC,CAAC;AAEF,eAAO,MAAM,8BAA8B,wBAClB,MAAM,GAAG,SAAS,eAC1B,WAAW,KACzB,OAAO,CAAC,IAAI,CA+Gd,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,IAAI,CA8C1D,CAAC"}

package/dist/handlers/dbt/apiClient.js

@@ -168,21 +168,32 @@ const lightdashRawApi = async ({ method, url, body, headers: requestHeaders = {}
         connectionResponses.add(response);
         return response;
     }
-    if (!(config.context?.apiKey && config.context.serverUrl)) {
+    if (!config.context?.serverUrl) {
         throw new common_1.AuthorizationError(`Not logged in. Run 'lightdash login --help'`);
     }
-    const headers = {
-        ...(0, utils_1.buildRequestHeaders)(config.context.apiKey),
-        ...requestHeaders,
-    };
     const fullUrl = new url_1.URL(url, config.context.serverUrl).href;
-    globalState_1.default.debug(`> Making HTTP ${method} request to: ${fullUrl}`);
-    const response = await fetchWithTimeout(fullUrl, {
+    let credential = await (0, credentials_1.resolveCredential)(config);
+    const send = () => fetchWithTimeout(fullUrl, {
         method,
-        headers,
+        headers: {
+            ...(0, utils_1.buildCredentialHeaders)(credential, config.context?.proxyAuthorization ?? null),
+            ...requestHeaders,
+        },
         body,
         signal,
     });
+    globalState_1.default.debug(`> Making HTTP ${method} request to: ${fullUrl}`);
+    let response = await send();
+    if (response.status === 401 &&
+        safeToRetry &&
+        method === 'GET' &&
+        body === undefined &&
+        credential.kind === 'personal_oauth') {
+        if (response.body instanceof stream_1.Readable)
+            response.body.destroy();
+        credential = await (0, credentials_1.resolveCredential)(config, null, credential.login.tokens.generation);
+        response = await send();
+    }
     globalState_1.default.debug(`> HTTP request returned status: ${response.status}`);
     if (!response.ok) {
         const contentType = response.headers.get('content-type');
@@ -244,10 +255,7 @@ const readApiResults = async (response) => {
     }
 };
 const lightdashApi = async ({ method, url, body, signal, safeToRetry, }) => {
-    if ((0, credentials_1.getAgentConnectionSelection)() !== null &&
-        safeToRetry &&
-        method === 'GET' &&
-        body === undefined) {
+    if (safeToRetry && method === 'GET' && body === undefined) {
         return readApiResults(await (0, exports.lightdashRawApi)({ method, url, body, signal, safeToRetry }));
     }
     const headers = {};

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

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/handlers/diagnostics.ts"],"names":[],"mappings":"AAiBA,KAAK,kBAAkB,GAAG;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA2HF,eAAO,MAAM,kBAAkB,YAAmB,kBAAkB,kBA4InE,CAAC"}
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/handlers/diagnostics.ts"],"names":[],"mappings":"AAiBA,KAAK,kBAAkB,GAAG;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA4HF,eAAO,MAAM,kBAAkB,YAAmB,kBAAkB,kBA4InE,CAAC"}

package/dist/handlers/diagnostics.js

@@ -37,7 +37,7 @@ const getAuthStatus = async () => {
         const organizationUuid = config.user?.organizationUuid || 'Not set';
         const projectName = config.context?.projectName || 'Not set';
         const projectUuid = config.context?.project || 'Not set';
-        if (!(config.context?.apiKey && config.context?.serverUrl)) {
+        if (!config.context?.serverUrl) {
             return {
                 status: 'missing_credentials',
                 serverUrl,
@@ -47,6 +47,7 @@ const getAuthStatus = async () => {
             };
         }
         try {
+            await (0, credentials_1.resolveCredential)(config);
             const user = await (0, apiClient_1.getUserContext)();
             return {
                 status: 'authenticated',