n8n 2.7.2 → 2.8.0

package/dist/modules/workflow-index/workflow-index.service.js

@@ -19,12 +19,13 @@ const event_service_1 = require("../../events/event.service");
 const LOOP_LIMIT = 1_000_000_000;
 const WORKFLOW_INDEXED_PLACEHOLDER_KEY = '__INDEXED__';
 let WorkflowIndexService = class WorkflowIndexService {
-    constructor(dependencyRepository, workflowRepository, eventService, logger, errorReporter, batchSize = 100) {
+    constructor(dependencyRepository, workflowRepository, eventService, logger, errorReporter, tracing, batchSize = 100) {
         this.dependencyRepository = dependencyRepository;
         this.workflowRepository = workflowRepository;
         this.eventService = eventService;
         this.logger = logger;
         this.errorReporter = errorReporter;
+        this.tracing = tracing;
         this.batchSize = batchSize;
     }
     init() {
@@ -39,7 +40,7 @@ let WorkflowIndexService = class WorkflowIndexService {
             await this.updateIndexForDraft(workflow);
         });
         this.eventService.on('workflow-deleted', async ({ workflowId }) => {
-            await this.dependencyRepository.removeDependenciesForWorkflow(workflowId);
+            await this.removeDependenciesForWorkflow(workflowId);
         });
         this.eventService.on('workflow-activated', async ({ workflow }) => {
             if (workflow.activeVersionId === null) {
@@ -50,9 +51,12 @@ let WorkflowIndexService = class WorkflowIndexService {
         });
     }
     async buildIndex() {
-        const draftCount = await this.buildIndexInternal(async (batchSize) => await this.workflowRepository.findWorkflowsNeedingIndexing(batchSize), 'draft');
-        const publishedCount = await this.buildIndexInternal(async (batchSize) => await this.workflowRepository.findWorkflowsNeedingPublishedVersionIndexing(batchSize), 'published');
-        this.logger.info(`Finished building workflow dependency index. Processed ${draftCount} draft workflows, ${publishedCount} published workflows.`);
+        return await this.tracing.startSpan({ name: 'WorkflowIndex build', op: 'workflow-index.build' }, async (span) => {
+            const draftCount = await this.buildIndexInternal(async (batchSize) => await this.workflowRepository.findWorkflowsNeedingIndexing(batchSize), 'draft');
+            const publishedCount = await this.buildIndexInternal(async (batchSize) => await this.workflowRepository.findWorkflowsNeedingPublishedVersionIndexing(batchSize), 'published');
+            this.logger.info(`Finished building workflow dependency index. Processed ${draftCount} draft workflows, ${publishedCount} published workflows.`);
+            span.setStatus({ code: 1 });
+        });
     }
     async buildIndexInternal(unindexedWorkflowFinder, dependencyType) {
         const batchSize = this.batchSize;
@@ -91,31 +95,53 @@ let WorkflowIndexService = class WorkflowIndexService {
         const dependencyUpdates = new db_1.WorkflowDependencies(workflow.id, workflow.versionCounter, publishedVersionId);
         return await this.updateIndexInternal(workflow, dependencyUpdates);
     }
-    async updateIndexInternal(workflow, dependencyUpdates) {
-        workflow.nodes.forEach((node) => {
-            this.addNodeTypeDependencies(node, dependencyUpdates);
-            this.addCredentialDependencies(node, dependencyUpdates);
-            this.addWorkflowCallDependencies(node, dependencyUpdates);
-            this.addWebhookPathDependencies(node, dependencyUpdates);
+    async removeDependenciesForWorkflow(workflowId) {
+        return await this.tracing.startSpan({
+            name: 'WorkflowIndex remove',
+            op: 'workflow-index.remove',
+            attributes: this.tracing.pickWorkflowAttributes({ id: workflowId }),
+        }, async (span) => {
+            await this.dependencyRepository.removeDependenciesForWorkflow(workflowId);
+            span.setStatus({ code: 1 });
         });
-        if (dependencyUpdates.dependencies.length === 0) {
-            dependencyUpdates.add({
-                dependencyType: 'workflowIndexed',
-                dependencyKey: WORKFLOW_INDEXED_PLACEHOLDER_KEY,
-                dependencyInfo: null,
+    }
+    async updateIndexInternal(workflow, dependencyUpdates) {
+        const indexType = dependencyUpdates.publishedVersionId ? 'published' : 'draft';
+        return await this.tracing.startSpan({
+            name: 'WorkflowIndex update',
+            op: 'workflow-index.update',
+            attributes: {
+                ...this.tracing.pickWorkflowAttributes(workflow),
+                'n8n.workflow-index.type': indexType,
+            },
+        }, async (span) => {
+            workflow.nodes.forEach((node) => {
+                this.addNodeTypeDependencies(node, dependencyUpdates);
+                this.addCredentialDependencies(node, dependencyUpdates);
+                this.addWorkflowCallDependencies(node, dependencyUpdates);
+                this.addWebhookPathDependencies(node, dependencyUpdates);
             });
-        }
-        let updated;
-        try {
-            updated = await this.dependencyRepository.updateDependenciesForWorkflow(workflow.id, dependencyUpdates);
-        }
-        catch (e) {
-            const error = (0, n8n_workflow_1.ensureError)(e);
-            this.logger.error(`Failed to update workflow ${dependencyUpdates.publishedVersionId ? 'published' : 'draft'} dependency index for workflow ${workflow.id}: ${error.message}`);
-            this.errorReporter.error(error);
-            return;
-        }
-        this.logger.debug(`Workflow ${dependencyUpdates.publishedVersionId ? 'published' : 'draft'} dependency index ${updated ? 'updated' : 'skipped'} for workflow ${workflow.id}`);
+            if (dependencyUpdates.dependencies.length === 0) {
+                dependencyUpdates.add({
+                    dependencyType: 'workflowIndexed',
+                    dependencyKey: WORKFLOW_INDEXED_PLACEHOLDER_KEY,
+                    dependencyInfo: null,
+                });
+            }
+            let updated;
+            try {
+                updated = await this.dependencyRepository.updateDependenciesForWorkflow(workflow.id, dependencyUpdates);
+            }
+            catch (e) {
+                const error = (0, n8n_workflow_1.ensureError)(e);
+                this.logger.error(`Failed to update workflow ${indexType} dependency index for workflow ${workflow.id}: ${error.message}`);
+                this.errorReporter.error(error);
+                span.setStatus({ code: 2 });
+                return;
+            }
+            this.logger.debug(`Workflow ${indexType} dependency index ${updated ? 'updated' : 'skipped'} for workflow ${workflow.id}`);
+            span.setStatus({ code: 1 });
+        });
     }
     addNodeTypeDependencies(node, dependencyUpdates) {
         if (node.type) {
@@ -200,6 +226,7 @@ exports.WorkflowIndexService = WorkflowIndexService = __decorate([
         db_1.WorkflowRepository,
         event_service_1.EventService,
         backend_common_1.Logger,
-        n8n_core_1.ErrorReporter, Object])
+        n8n_core_1.ErrorReporter,
+        n8n_core_1.Tracing, Object])
 ], WorkflowIndexService);
 //# sourceMappingURL=workflow-index.service.js.map

package/dist/modules/workflow-index/workflow-index.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-index.service.js","sourceRoot":"","sources":["../../../src/modules/workflow-index/workflow-index.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-index.service.js","sourceRoot":"","sources":["../../../src/modules/workflow-index/workflow-index.service.ts"],"names":[],"mappings":"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"}

package/dist/oauth/oauth.service.d.ts

@@ -26,6 +26,7 @@ export declare class OauthService {
     private readonly cipher;
     private readonly dynamicCredentialsProxy;
     constructor(logger: Logger, credentialsHelper: CredentialsHelper, credentialsRepository: CredentialsRepository, credentialsFinderService: CredentialsFinderService, urlService: UrlService, globalConfig: GlobalConfig, externalHooks: ExternalHooks, cipher: Cipher, dynamicCredentialsProxy: DynamicCredentialsProxy);
+    private validateOAuthUrlOrThrow;
     getBaseUrl(oauthVersion: OauthVersion): string;
     getCredential(req: OAuthRequest.OAuth1Credential.Auth | OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity>;
     protected getAdditionalData(): Promise<IWorkflowExecuteAdditionalData>;

package/dist/oauth/oauth.service.js

@@ -60,6 +60,7 @@ const credentials_helper_1 = require("../credentials-helper");
 const auth_error_1 = require("../errors/response-errors/auth.error");
 const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const not_found_error_1 = require("../errors/response-errors/not-found.error");
+const validate_oauth_url_1 = require("../oauth/validate-oauth-url");
 const url_service_1 = require("../services/url.service");
 const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
 const client_oauth2_1 = require("@n8n/client-oauth2");
@@ -91,6 +92,15 @@ let OauthService = class OauthService {
         this.cipher = cipher;
         this.dynamicCredentialsProxy = dynamicCredentialsProxy;
     }
+    validateOAuthUrlOrThrow(url) {
+        try {
+            (0, validate_oauth_url_1.validateOAuthUrl)(url);
+        }
+        catch (e) {
+            this.logger.error('Invalid OAuth URL', { url, error: e });
+            throw e;
+        }
+    }
     getBaseUrl(oauthVersion) {
         const restUrl = `${this.urlService.getInstanceBaseUrl()}/${this.globalConfig.endpoints.rest}`;
         return `${restUrl}/oauth${oauthVersion}-credential`;
@@ -163,7 +173,13 @@ let OauthService = class OauthService {
                 ...decryptedState,
             };
         }
-        if (!exports.skipAuthOnOAuthCallback && decryptedState.userId !== req.user?.id) {
+        if (exports.skipAuthOnOAuthCallback) {
+            return {
+                ...decoded,
+                ...decryptedState,
+            };
+        }
+        if (req.user?.id === undefined || decryptedState.userId !== req.user.id) {
             throw new auth_error_1.AuthError('Unauthorized');
         }
         return {
@@ -210,8 +226,8 @@ let OauthService = class OauthService {
         const oauthCredentials = await this.getOAuthCredentials(credential);
         const toUpdate = {};
         if (oauthCredentials.useDynamicClientRegistration && oauthCredentials.serverUrl) {
-            const serverUrl = new URL(oauthCredentials.serverUrl);
-            const { data } = await axios_1.default.get(`${serverUrl.origin}/.well-known/oauth-authorization-server`);
+            const serverUrl = oauthCredentials.serverUrl.replace(/\/$/, '');
+            const { data } = await axios_1.default.get(`${serverUrl}/.well-known/oauth-authorization-server`);
             const metadataValidation = oauth2_dynamic_client_registration_schema_1.oAuthAuthorizationServerMetadataSchema.safeParse(data);
             if (!metadataValidation.success) {
                 throw new bad_request_error_1.BadRequestError(`Invalid OAuth2 server metadata: ${metadataValidation.error.issues.map((e) => e.message).join(', ')}`);
@@ -257,6 +273,8 @@ let OauthService = class OauthService {
                 toUpdate.clientSecret = client_secret;
             }
         }
+        this.validateOAuthUrlOrThrow(oauthCredentials.authUrl ?? '');
+        this.validateOAuthUrlOrThrow(oauthCredentials.accessTokenUrl ?? '');
         const [csrfSecret, state] = this.createCsrfState(csrfData);
         const oAuthOptions = {
             ...this.convertCredentialToOptions(oauthCredentials),
@@ -287,6 +305,9 @@ let OauthService = class OauthService {
     }
     async generateAOauth1AuthUri(credential, csrfData) {
         const oauthCredentials = await this.getOAuthCredentials(credential);
+        this.validateOAuthUrlOrThrow(oauthCredentials.authUrl ?? '');
+        this.validateOAuthUrlOrThrow(oauthCredentials.requestTokenUrl ?? '');
+        this.validateOAuthUrlOrThrow(oauthCredentials.accessTokenUrl ?? '');
         const [csrfSecret, state] = this.createCsrfState(csrfData);
         const signatureMethod = oauthCredentials.signatureMethod;
         const oAuthOptions = {

package/dist/oauth/oauth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuDA,sEAGC;AA1DD,wDAA6C;AAC7C,wCAA2C;AAE3C,gCAAgD;AAChD,gCAAkC;AAClC,gDAAwB;AAExB,uCAA+C;AAE/C,+CAA0D;AAE1D,2CAGqB;AACrB,yFAAoF;AACpF,6DAAyD;AACzD,oEAAgE;AAChE,kFAA6E;AAC7E,8EAAyE;AAEzE,mEAA8D;AAC9D,wDAAoD;AACpD,kGAAoF;AACpF,sDAM4B;AAC5B,kDAA0B;AAC1B,6HAGuE;AACvE,oEAA2C;AAC3C,gDAAkC;AAClC,yDAAiC;AACjC,qDAAiD;AAEjD,mCAAoC;AAEpC,4DAAsC;AACtC,mCAOiB;AAWR,6FAfR,oBAAY,OAeQ;AATrB,uFAAkF;AAElF,SAAgB,6BAA6B;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,WAAW,EAAE,IAAI,OAAO,CAAC;IACpF,OAAO,KAAK,KAAK,MAAM,CAAC;AACzB,CAAC;AAEY,QAAA,uBAAuB,GAAG,6BAA6B,EAAE,CAAC;AAKhE,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACoB,MAAc,EAChB,iBAAoC,EACpC,qBAA4C,EAC5C,wBAAkD,EAClD,UAAsB,EACtB,YAA0B,EAC1B,aAA4B,EAC5B,MAAc,EACd,uBAAgD;QAR9C,WAAM,GAAN,MAAM,CAAQ;QAChB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAQ;QACd,4BAAuB,GAAvB,uBAAuB,CAAyB;IAC/D,CAAC;IAEI,uBAAuB,CAAC,GAAW;QAC1C,IAAI,CAAC;YACJ,IAAA,qCAAgB,EAAC,GAAG,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAED,UAAU,CAAC,YAA0B;QACpC,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9F,OAAO,GAAG,OAAO,SAAS,YAAY,aAAa,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,GAA4E;QAE5E,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAEvC,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAe,CAAC,mCAAmC,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,qBAAqB,CAC3E,YAAY,EACZ,GAAG,CAAC,IAAI,EACR,CAAC,iBAAiB,CAAC,CACnB,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,sGAAsG,EACtG,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CACvB,CAAC;YACF,MAAM,IAAI,+BAAa,CAAC,mCAAuB,CAAC,aAAa,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,iBAAiB;QAChC,OAAO,MAAM,6BAA6B,CAAC,OAAO,EAAE,CAAC;IACtD,CAAC;IAKS,KAAK,CAAC,0BAA0B,CACzC,UAA0B,EAC1B,cAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAKS,KAAK,CAAC,2BAA2B,CAC1C,UAA0B,EAC1B,cAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,UAA0B,EAC1B,cAA8C,EAC9C,GAAY;QAEZ,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC/C,cAAc,EACd,UAAU,EACV,UAAU,CAAC,IAAI,EACf,UAAU,EACV,SAAS,EACT,GAAG,CACH,CAAC;IACH,CAAC;IAES,KAAK,CAAC,0BAA0B,CACzC,UAA0B,EAC1B,aAA6C,EAC7C,cAA8C;QAE9C,MAAM,qBAAqB,GAC1B,MAAM,IAAI,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;QAC1E,OAAO,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CAC9D,cAAc,EACd,aAAa,EACb,UAAU,CAAC,IAAI,EACf,UAAU,EACV,qBAAqB,EACrB,SAAS,EACT,SAAS,CACT,CAAiB,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,kBAAkB,CACvB,UAA0B,EAC1B,QAAwC,EACxC,WAAqB,EAAE;QAEvB,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAClF,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE;YACtD,GAAG,WAAW,CAAC,aAAa,EAAE;YAC9B,SAAS,EAAE,IAAI,IAAI,EAAE;SACrB,CAAC,CAAC;IACJ,CAAC;IAGS,KAAK,CAAC,wBAAwB,CACvC,YAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,eAAe,CAAC,IAAyB;QACxC,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,KAAK,GAAc;YACxB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;YAC/B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SAC/C,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1E,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAClC,CAAC;IAES,eAAe,CACxB,YAAoB,EACpB,GAAyB;QAEzB,MAAM,YAAY,GAAG,sBAAsB,CAAC;QAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QACpE,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAY,YAAY,EAAE;YAClD,YAAY;SACZ,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAA,wBAAS,EAAsB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxF,YAAY;SACZ,CAAC,CAAC;QAEH,IAAI,OAAO,cAAc,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACjF,MAAM,IAAI,8BAAe,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC;QAGD,IAAI,cAAc,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;YACpD,OAAO;gBACN,GAAG,OAAO;gBACV,GAAG,cAAc;aACjB,CAAC;QACH,CAAC;QAGD,IAAI,+BAAuB,EAAE,CAAC;YAC7B,OAAO;gBACN,GAAG,OAAO;gBACV,GAAG,cAAc;aACjB,CAAC;QACH,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,SAAS,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACzE,MAAM,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;QAED,OAAO;YACN,GAAG,OAAO;YACV,GAAG,cAAc;SACjB,CAAC;IACH,CAAC;IAES,eAAe,CACxB,SAAmE,EACnE,KAAgB;QAEhB,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAC;QAEzB,OAAO,CACN,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,IAAI,oBAAY;YAC5C,SAAS,CAAC,UAAU,KAAK,SAAS;YAClC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAC/C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,GAAoF;QAIpF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,8BAAe,CAAC,2DAA2D,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CACnE,UAAU,EACV,cAAc,CACd,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAC7D,UAAU,EACV,qBAAqB,EACrB,cAAc,CACd,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,8BAAe,CAAC,sCAAsC,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,CAAC,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACrE,CAAC;IAED,mBAAmB,CAAC,GAAa,EAAE,OAAe,EAAE,MAAe;QAClE,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAI,UAA6B;QACzD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAKhG,IACC,qBAAqB,EAAE,KAAK;YAC5B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAClC,CAAC,0DAA8C,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EACxE,CAAC;YACF,OAAO,qBAAqB,CAAC,KAAK,CAAC;QACpC,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAC7D,UAAU,EACV,qBAAqB,EACrB,cAAc,CACd,CAAC;QAEF,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,UAA6B,EAC7B,QAA6B;QAE7B,MAAM,gBAAgB,GACrB,MAAM,IAAI,CAAC,mBAAmB,CAAuB,UAAU,CAAC,CAAC;QAElE,MAAM,QAAQ,GAAmC,EAAE,CAAC;QAEpD,IAAI,gBAAgB,CAAC,4BAA4B,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YACjF,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAChE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,eAAK,CAAC,GAAG,CAC/B,GAAG,SAAS,yCAAyC,CACrD,CAAC;YACF,MAAM,kBAAkB,GAAG,kFAAsC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAClF,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBACjC,MAAM,IAAI,mCAAe,CACxB,mCAAmC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACrG,CAAC;YACH,CAAC;YAED,MAAM,EAAE,sBAAsB,EAAE,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,GACxF,kBAAkB,CAAC,IAAI,CAAC;YACzB,gBAAgB,CAAC,OAAO,GAAG,sBAAsB,CAAC;YAClD,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;YACjD,QAAQ,CAAC,OAAO,GAAG,sBAAsB,CAAC;YAC1C,QAAQ,CAAC,cAAc,GAAG,cAAc,CAAC;YACzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,IAAI,KAAK,EAAE,CAAC;gBACX,gBAAgB,CAAC,KAAK,GAAG,KAAK,CAAC;gBAC/B,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;YACxB,CAAC;YAED,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,sCAAsC,CAChF,kBAAkB,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,EACnF,kBAAkB,CAAC,IAAI,CAAC,qCAAqC,IAAI,CAAC,qBAAqB,CAAC,EACxF,kBAAkB,CAAC,IAAI,CAAC,gCAAgC,IAAI,EAAE,CAC9D,CAAC;YACF,gBAAgB,CAAC,SAAS,GAAG,SAAS,CAAC;YACvC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;YAC/B,IAAI,cAAc,EAAE,CAAC;gBACpB,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;gBACjD,QAAQ,CAAC,cAAc,GAAG,cAAc,CAAC;YAC1C,CAAC;YAED,MAAM,EAAE,WAAW,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,mCAAmC,CAC3F,SAAS,EACT,cAAc,CACd,CAAC;YACF,MAAM,eAAe,GAAG;gBACvB,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,GAAiB,WAAW,CAAC;gBAC/D,0BAA0B;gBAC1B,WAAW;gBACX,cAAc,EAAE,CAAC,MAAM,CAAC;gBACxB,WAAW,EAAE,KAAK;gBAClB,UAAU,EAAE,iBAAiB;gBAC7B,KAAK;aACL,CAAC;YAEF,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,kCAAkC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;YAEpF,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,eAAK,CAAC,IAAI,CAChD,qBAAqB,EACrB,eAAe,CACf,CAAC;YACF,MAAM,sBAAsB,GAC3B,mFAAuC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACnE,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;gBACrC,MAAM,IAAI,mCAAe,CACxB,yCAAyC,sBAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC/G,CAAC;YACH,CAAC;YAED,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,sBAAsB,CAAC,IAAI,CAAC;YACjE,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC;YACtC,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC9B,IAAI,aAAa,EAAE,CAAC;gBACnB,gBAAgB,CAAC,YAAY,GAAG,aAAa,CAAC;gBAC9C,QAAQ,CAAC,YAAY,GAAG,aAAa,CAAC;YACvC,CAAC;QACF,CAAC;QAED,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QAGpE,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAE3D,MAAM,YAAY,GAAG;YACpB,GAAG,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,CAAC;YACpD,KAAK;SACL,CAAC;QAEF,IAAI,gBAAgB,CAAC,mBAAmB,EAAE,CAAC;YAC1C,YAAY,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAEpE,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;QACjC,IAAI,gBAAgB,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YAC3C,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,wBAAa,GAAE,CAAC;YAChE,YAAY,CAAC,KAAK,GAAG;gBACpB,GAAG,YAAY,CAAC,KAAK;gBACrB,cAAc;gBACd,qBAAqB,EAAE,MAAM;aAC7B,CAAC;YACF,QAAQ,CAAC,YAAY,GAAG,aAAa,CAAC;QACvC,CAAC;QAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpD,MAAM,QAAQ,GAAG,IAAI,4BAAY,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE;YACpE,QAAQ;YACR,YAAY,EAAE,UAAU,CAAC,EAAE;SAC3B,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,UAA6B,EAC7B,QAA6B;QAE7B,MAAM,gBAAgB,GACrB,MAAM,IAAI,CAAC,mBAAmB,CAAuB,UAAU,CAAC,CAAC;QAElE,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QAEpE,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAE3D,MAAM,eAAe,GAAG,gBAAgB,CAAC,eAAe,CAAC;QAEzD,MAAM,YAAY,GAAyB;YAC1C,QAAQ,EAAE;gBACT,GAAG,EAAE,gBAAgB,CAAC,WAAW;gBACjC,MAAM,EAAE,gBAAgB,CAAC,cAAc;aACvC;YACD,gBAAgB,EAAE,eAAe;YAEjC,aAAa,CAAC,IAAI,EAAE,GAAG;gBACtB,MAAM,SAAS,GAAG,oBAAY,CAAC,eAAe,CAAC,IAAI,MAAM,CAAC;gBAC1D,OAAO,IAAA,mBAAU,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjE,CAAC;SACD,CAAC;QAEF,MAAM,gBAAgB,GAAG;YACxB,cAAc,EAAE,GAAG,IAAI,CAAC,UAAU,GAAiB,mBAAmB,KAAK,EAAE;SAC7E,CAAC;QAEF,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEtF,MAAM,KAAK,GAAG,IAAI,oBAAY,CAAC,YAAY,CAAC,CAAC;QAE7C,MAAM,OAAO,GAAmB;YAC/B,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,gBAAgB,CAAC,eAAe;YACrC,IAAI,EAAE,gBAAgB;SACtB,CAAC;QAEF,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAuB;YACvC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE;gBACR,GAAG,IAAI;aACP;SACD,CAAC;QAEF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAG5D,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,IAAI,mCAAe,CACxB,iGAAiG,CACjG,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,mCAAe,CACxB,yEAAyE,CACzE,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,gBAAgB,CAAC,OAAO,gBAAgB,YAAY,CAAC,WAAW,EAAE,CAAC;QAExF,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE;YACpE,QAAQ;YACR,YAAY,EAAE,UAAU,CAAC,EAAE;SAC3B,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,0BAA0B,CAAC,UAAgC;QAClE,MAAM,OAAO,GAAwB;YACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,YAAY,EAAE,UAAU,CAAC,YAAY,IAAI,EAAE;YAC3C,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,EAAE;YAC/C,gBAAgB,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;YAC1C,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,QAAQ;YACrD,WAAW,EAAE,GAAG,IAAI,CAAC,UAAU,GAAiB,WAAW;YAC3D,MAAM,EAAE,IAAA,eAAK,EAAC,UAAU,CAAC,KAAK,IAAI,QAAQ,EAAE,GAAG,CAAC;YAChD,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;YAC5D,eAAe,EAAE,UAAU,CAAC,eAAe,IAAI,KAAK;SACpD,CAAC;QAEF,IACC,UAAU,CAAC,wBAAwB;YACnC,OAAO,UAAU,CAAC,wBAAwB,KAAK,QAAQ,EACtD,CAAC;YACF,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAyB,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAE1F,IAAI,UAAU,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAEO,sCAAsC,CAC7C,UAAoB,EACpB,wBAAkC,EAClC,oBAA8B;QAE9B,IAAI,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACvF,IAAI,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YAC9B,CAAC;YAED,IAAI,wBAAwB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBAC9D,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC;YACrE,CAAC;YAED,IAAI,wBAAwB,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAC7D,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;YACnE,CAAC;QACF,CAAC;QAED,IAAI,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC/C,IAAI,wBAAwB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBAC9D,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC;YACrE,CAAC;YAED,IAAI,wBAAwB,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBAC7D,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;YACnE,CAAC;QACF,CAAC;QAED,MAAM,IAAI,mCAAe,CAAC,yDAAyD,CAAC,CAAC;IACtF,CAAC;IAEO,mCAAmC,CAC1C,SAA0B,EAC1B,cAA2C;QAE3C,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO;gBACN,WAAW,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;gBACpD,0BAA0B,EAAE,MAAM;aAClC,CAAC;QACH,CAAC;QAED,MAAM,uBAAuB,GAC5B,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,oBAAoB,CAAC;QAC5E,IAAI,SAAS,KAAK,mBAAmB,EAAE,CAAC;YACvC,OAAO;gBACN,WAAW,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;gBACpD,0BAA0B,EAAE,uBAAuB;aACnD,CAAC;QACH,CAAC;QAED,OAAO;YACN,WAAW,EAAE,CAAC,oBAAoB,CAAC;YACnC,0BAA0B,EAAE,uBAAuB;SACnD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAC1B,UAA6B,EAC7B,cAA8C,EAC9C,UAAkB,EAClB,oBAA4B;QAE5B,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAClF,WAAW,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAEvD,MAAM,uBAAuB,GAA4B;YACxD,EAAE,EAAE,UAAU,CAAC,EAAE;YACjB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,YAAY,EAAE,UAAU,CAAC,YAAY;YACrC,UAAU,EAAE,oBAAoB;SAChC,CAAC;QAEF,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAC/C,uBAAuB,EACvB,cAAc,EAEd,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,EACpC,WAAW,CAAC,OAAO,EAAE,EACrB,EAAE,oBAAoB,EAAE,CACxB,CAAC;IACH,CAAC;CACD,CAAA;AA/jBY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,YAAO,GAAE;qCAGmB,uBAAM;QACG,sCAAiB;QACb,0BAAqB;QAClB,qDAAwB;QACtC,wBAAU;QACR,qBAAY;QACX,8BAAa;QACpB,iBAAM;QACW,mDAAuB;GAVtD,YAAY,CA+jBxB"}

package/dist/oauth/validate-oauth-url.d.ts

@@ -0,0 +1 @@
+export declare function validateOAuthUrl(url: string): void;

package/dist/oauth/validate-oauth-url.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOAuthUrl = validateOAuthUrl;
+const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
+const ALLOWED_OAUTH_URL_PROTOCOLS = ['http:', 'https:'];
+function validateOAuthUrl(url) {
+    const trimmed = url?.trim();
+    if (!trimmed)
+        return;
+    let parsed;
+    try {
+        parsed = new URL(trimmed);
+    }
+    catch {
+        throw new bad_request_error_1.BadRequestError('OAuth url is not a valid URL.');
+    }
+    if (!ALLOWED_OAUTH_URL_PROTOCOLS.includes(parsed.protocol)) {
+        throw new bad_request_error_1.BadRequestError(`OAuth url must use HTTP or HTTPS protocol. Invalid protocol: ${parsed.protocol}`);
+    }
+}
+//# sourceMappingURL=validate-oauth-url.js.map

package/dist/oauth/validate-oauth-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-oauth-url.js","sourceRoot":"","sources":["../../src/oauth/validate-oauth-url.ts"],"names":[],"mappings":";;AAWA,4CAgBC;AA3BD,kFAA6E;AAE7E,MAAM,2BAA2B,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AASxD,SAAgB,gBAAgB,CAAC,GAAW;IAC3C,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACJ,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,mCAAe,CAAC,+BAA+B,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,mCAAe,CACxB,gEAAgE,MAAM,CAAC,QAAQ,EAAE,CACjF,CAAC;IACH,CAAC;AACF,CAAC"}

package/dist/public-api/types.d.ts

@@ -139,6 +139,11 @@ export declare namespace UserRequest {
     }>;
 }
 export declare namespace CredentialRequest {
+    type GetAll = AuthenticatedRequest<{}, {}, {}, {
+        limit?: number;
+        cursor?: string;
+        offset?: number;
+    }>;
     type Create = AuthenticatedRequest<{}, {}, {
         type: string;
         name: string;

package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts

@@ -1,7 +1,22 @@
 import type { CredentialsEntity } from '@n8n/db';
 import type express from 'express';
+import { buildSharedForCredential } from './credentials.service';
 import type { CredentialTypeRequest, CredentialRequest } from '../../../types';
 declare const _default: {
+    getCredentials: (((req: import("../../../types").PaginatedRequest, res: express.Response, next: express.NextFunction) => express.Response | void) | ((req: import("@n8n/db").AuthenticatedRequest<{
+        id?: string;
+        dataTableId?: string;
+    }>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: CredentialRequest.GetAll, res: express.Response) => Promise<express.Response<{
+        data: Array<{
+            id: string;
+            name: string;
+            type: string;
+            createdAt: Date;
+            updatedAt: Date;
+            shared: ReturnType<typeof buildSharedForCredential>;
+        }>;
+        nextCursor: string | null;
+    }>>))[];
     createCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void) | ((req: CredentialRequest.Create, res: express.Response) => Promise<express.Response<Partial<CredentialsEntity>>>))[];
     updateCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
         id?: string;

package/dist/public-api/v1/handlers/credentials/credentials.handler.js

@@ -6,20 +6,55 @@ const zod_1 = require("zod");
 const credential_types_1 = require("../../../../credential-types");
 const credentials_service_ee_1 = require("../../../../credentials/credentials.service.ee");
 const credentials_helper_1 = require("../../../../credentials-helper");
+const response_error_1 = require("../../../../errors/response-errors/abstract/response.error");
 const credentials_middleware_1 = require("./credentials.middleware");
 const credentials_service_1 = require("./credentials.service");
 const global_middleware_1 = require("../../shared/middlewares/global.middleware");
+const pagination_service_1 = require("../../shared/services/pagination.service");
+const db_1 = require("@n8n/db");
 module.exports = {
+    getCredentials: [
+        (0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'credential:list' }),
+        global_middleware_1.validCursor,
+        async (req, res) => {
+            const offset = Number(req.query.offset) || 0;
+            const limit = Math.min(Number(req.query.limit) || 100, 250);
+            const repo = di_1.Container.get(db_1.CredentialsRepository);
+            const [credentials, count] = await repo.findAndCount({
+                take: limit,
+                skip: offset,
+                select: ['id', 'name', 'type', 'createdAt', 'updatedAt'],
+                relations: ['shared', 'shared.project'],
+                order: { createdAt: 'DESC' },
+            });
+            const data = credentials.map((credential) => {
+                const shared = (0, credentials_service_1.buildSharedForCredential)(credential);
+                return {
+                    id: credential.id,
+                    name: credential.name,
+                    type: credential.type,
+                    createdAt: credential.createdAt,
+                    updatedAt: credential.updatedAt,
+                    shared,
+                };
+            });
+            return res.json({
+                data,
+                nextCursor: (0, pagination_service_1.encodeNextCursor)({
+                    offset,
+                    limit,
+                    numberOfTotalRecords: count,
+                }),
+            });
+        },
+    ],
     createCredential: [
         credentials_middleware_1.validCredentialType,
         credentials_middleware_1.validCredentialsProperties,
         (0, global_middleware_1.apiKeyHasScope)('credential:create'),
         async (req, res) => {
             try {
-                const newCredential = await (0, credentials_service_1.createCredential)(req.body);
-                const encryptedData = await (0, credentials_service_1.encryptCredential)(newCredential);
-                Object.assign(newCredential, encryptedData);
-                const savedCredential = await (0, credentials_service_1.saveCredential)(newCredential, req.user, encryptedData);
+                const savedCredential = await (0, credentials_service_1.saveCredential)(req.body, req.user);
                 return res.json((0, credentials_service_1.sanitizeCredentials)(savedCredential));
             }
             catch ({ message, httpStatusCode }) {
@@ -46,7 +81,7 @@ module.exports = {
                 }
             }
             try {
-                const updatedCredential = await (0, credentials_service_1.updateCredential)(credentialId, req.body);
+                const updatedCredential = await (0, credentials_service_1.updateCredential)(credentialId, req.user, req.body);
                 if (!updatedCredential) {
                     return res.status(404).json({ message: 'Credential not found' });
                 }
@@ -56,6 +91,9 @@ module.exports = {
                 if (error instanceof credentials_service_1.CredentialsIsNotUpdatableError) {
                     return res.status(400).json({ message: error.message });
                 }
+                if (error instanceof response_error_1.ResponseError) {
+                    return res.status(error.httpStatusCode).json({ message: error.message });
+                }
                 const message = error instanceof Error ? error.message : 'Unknown error';
                 return res.status(500).json({ message });
             }

package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credentials.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.handler.ts"],"names":[],"mappings":"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"}

package/dist/public-api/v1/handlers/credentials/credentials.service.d.ts

@@ -4,11 +4,23 @@ import { BaseError, type ICredentialDataDecryptedObject, type IDataObject, type
 import type { CredentialRequest } from '../../../../requests';
 export declare class CredentialsIsNotUpdatableError extends BaseError {
 }
+export type CredentialListSharedItem = {
+    id: string;
+    name: string;
+    role: string;
+    createdAt: Date;
+    updatedAt: Date;
+};
+export declare function buildSharedForCredential(credential: CredentialsEntity): CredentialListSharedItem[];
 export declare function getCredentials(credentialId: string): Promise<ICredentialsDb | null>;
 export declare function getSharedCredentials(userId: string, credentialId: string): Promise<SharedCredentials | null>;
 export declare function createCredential(properties: CredentialRequest.CredentialProperties): Promise<CredentialsEntity>;
-export declare function saveCredential(credential: CredentialsEntity, user: User, encryptedData: ICredentialsDb): Promise<CredentialsEntity>;
-export declare function updateCredential(credentialId: string, updateData: {
+export declare function saveCredential(payload: {
+    type: string;
+    name: string;
+    data: ICredentialDataDecryptedObject;
+}, user: User): Promise<CredentialsEntity>;
+export declare function updateCredential(credentialId: string, user: User, updateData: {
     type?: string;
     name?: string;
     data?: ICredentialDataDecryptedObject;

package/dist/public-api/v1/handlers/credentials/credentials.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialsIsNotUpdatableError = void 0;
+exports.buildSharedForCredential = buildSharedForCredential;
 exports.getCredentials = getCredentials;
 exports.getSharedCredentials = getSharedCredentials;
 exports.createCredential = createCredential;
@@ -15,11 +16,24 @@ const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const credentials_service_1 = require("../../../../credentials/credentials.service");
+const validation_1 = require("../../../../credentials/validation");
 const event_service_1 = require("../../../../events/event.service");
 const external_hooks_1 = require("../../../../external-hooks");
 class CredentialsIsNotUpdatableError extends n8n_workflow_1.BaseError {
 }
 exports.CredentialsIsNotUpdatableError = CredentialsIsNotUpdatableError;
+function buildSharedForCredential(credential) {
+    const shared = credential.shared;
+    return shared
+        .filter((sh) => typeof sh.project?.id === 'string')
+        .map((sh) => ({
+        id: sh.project.id,
+        name: sh.project.name,
+        role: sh.role,
+        createdAt: sh.createdAt,
+        updatedAt: sh.updatedAt,
+    }));
+}
 async function getCredentials(credentialId) {
     return await di_1.Container.get(db_1.CredentialsRepository).findOneBy({ id: credentialId });
 }
@@ -37,7 +51,11 @@ async function createCredential(properties) {
     Object.assign(newCredential, properties);
     return newCredential;
 }
-async function saveCredential(credential, user, encryptedData) {
+async function saveCredential(payload, user) {
+    const credential = await createCredential(payload);
+    (0, validation_1.validateExternalSecretsPermissions)(user, payload.data);
+    const encryptedData = await encryptCredential(credential);
+    Object.assign(credential, encryptedData);
     const projectRepository = di_1.Container.get(db_1.ProjectRepository);
     const { manager: dbManager } = projectRepository;
     const result = await dbManager.transaction(async (transactionManager) => {
@@ -66,7 +84,7 @@ async function saveCredential(credential, user, encryptedData) {
     });
     return result;
 }
-async function updateCredential(credentialId, updateData) {
+async function updateCredential(credentialId, user, updateData) {
     const existingCredential = await getCredentials(credentialId);
     if (!existingCredential) {
         return null;
@@ -84,6 +102,7 @@ async function updateCredential(credentialId, updateData) {
     if (updateData.data !== undefined) {
         const credentialsService = di_1.Container.get(credentials_service_1.CredentialsService);
         const decryptedData = credentialsService.decrypt(existingCredential, true);
+        (0, validation_1.validateExternalSecretsPermissions)(user, updateData.data, decryptedData);
         let dataToEncrypt;
         if (updateData.isPartialData === true) {
             const mergedData = {