n8n 2.0.3 → 2.1.1

package/dist/controllers/invitation.controller.js.map

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

package/dist/controllers/oauth/oauth1-credential.controller.d.ts

@@ -1,8 +1,11 @@
 import { Response } from 'express';
 import { OAuthRequest } from '../../requests';
-import { AbstractOAuthController } from './abstract-oauth.controller';
-export declare class OAuth1CredentialController extends AbstractOAuthController {
-    oauthVersion: number;
+import { OauthService } from '../../oauth/oauth.service';
+import { Logger } from '@n8n/backend-common';
+export declare class OAuth1CredentialController {
+    private readonly oauthService;
+    private readonly logger;
+    constructor(oauthService: OauthService, logger: Logger);
     getAuthUri(req: OAuthRequest.OAuth1Credential.Auth): Promise<string>;
     handleCallback(req: OAuthRequest.OAuth1Credential.Callback, res: Response): Promise<void>;
 }

package/dist/controllers/oauth/oauth1-credential.controller.js

@@ -15,80 +15,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth1CredentialController = void 0;
 const decorators_1 = require("@n8n/decorators");
 const axios_1 = __importDefault(require("axios"));
-const crypto_1 = require("crypto");
 const n8n_workflow_1 = require("n8n-workflow");
-const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
-const abstract_oauth_controller_1 = require("./abstract-oauth.controller");
-const algorithmMap = {
-    'HMAC-SHA256': 'sha256',
-    'HMAC-SHA512': 'sha512',
-    'HMAC-SHA1': 'sha1',
-};
-let OAuth1CredentialController = class OAuth1CredentialController extends abstract_oauth_controller_1.AbstractOAuthController {
-    constructor() {
-        super(...arguments);
-        this.oauthVersion = 1;
+const oauth_service_1 = require("../../oauth/oauth.service");
+const backend_common_1 = require("@n8n/backend-common");
+let OAuth1CredentialController = class OAuth1CredentialController {
+    constructor(oauthService, logger) {
+        this.oauthService = oauthService;
+        this.logger = logger;
     }
     async getAuthUri(req) {
-        const credential = await this.getCredential(req);
-        const additionalData = await this.getAdditionalData();
-        const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
-        const oauthCredentials = await this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
-        const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
-        const signatureMethod = oauthCredentials.signatureMethod;
-        const oAuthOptions = {
-            consumer: {
-                key: oauthCredentials.consumerKey,
-                secret: oauthCredentials.consumerSecret,
-            },
-            signature_method: signatureMethod,
-            hash_function(base, key) {
-                const algorithm = algorithmMap[signatureMethod] ?? 'sha1';
-                return (0, crypto_1.createHmac)(algorithm, key).update(base).digest('base64');
-            },
-        };
-        const oauthRequestData = {
-            oauth_callback: `${this.baseUrl}/callback?state=${state}`,
-        };
-        await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
-        const oauth = new oauth_1_0a_1.default(oAuthOptions);
-        const options = {
-            method: 'POST',
-            url: oauthCredentials.requestTokenUrl,
-            data: oauthRequestData,
-        };
-        const data = oauth.toHeader(oauth.authorize(options));
-        options.headers = data;
-        const { data: response } = await axios_1.default.request(options);
-        const paramsParser = new URLSearchParams(response);
-        const responseJson = Object.fromEntries(paramsParser.entries());
-        const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
-        await this.encryptAndSaveData(credential, { csrfSecret });
+        const credential = await this.oauthService.getCredential(req);
+        const uri = await this.oauthService.generateAOauth1AuthUri(credential, {
+            cid: credential.id,
+            origin: 'static-credential',
+            userId: oauth_service_1.skipAuthOnOAuthCallback ? undefined : req.user.id,
+        });
         this.logger.debug('OAuth1 authorization successful for new credential', {
             userId: req.user.id,
             credentialId: credential.id,
         });
-        return returnUri;
+        return uri;
     }
     async handleCallback(req, res) {
         try {
             const { oauth_verifier, oauth_token, state: encodedState } = req.query;
             if (!oauth_verifier || !oauth_token || !encodedState) {
-                return this.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
+                return this.oauthService.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            const [credential, _, oauthCredentials] = await this.resolveCredential(req);
+            const [credential, _, oauthCredentials, state] = await this.oauthService.resolveCredential(req);
             const oauthToken = await axios_1.default.post(oauthCredentials.accessTokenUrl, { oauth_token, oauth_verifier }, { headers: { 'content-type': 'application/x-www-form-urlencoded' } });
             const paramParser = new URLSearchParams(oauthToken.data);
             const oauthTokenData = Object.fromEntries(paramParser.entries());
-            await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
-            this.logger.debug('OAuth1 callback successful for new credential', {
-                credentialId: credential.id,
-            });
-            return res.render('oauth-callback');
+            if (!state.origin || state.origin === 'static-credential') {
+                await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
+                this.logger.debug('OAuth1 callback successful for new credential', {
+                    credentialId: credential.id,
+                });
+                return res.render('oauth-callback');
+            }
+            if (state.origin === 'dynamic-credential') {
+                if (!state.credentialResolverId || typeof state.credentialResolverId !== 'string') {
+                    return this.oauthService.renderCallbackError(res, 'Credential resolver ID is required');
+                }
+                if (!state.authorizationHeader ||
+                    typeof state.authorizationHeader !== 'string' ||
+                    !state.authorizationHeader.startsWith('Bearer ')) {
+                    return this.oauthService.renderCallbackError(res, 'Authorization header is required');
+                }
+                await this.oauthService.saveDynamicCredential(credential, oauthTokenData, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId);
+                return res.render('oauth-callback');
+            }
         }
         catch (e) {
             const error = (0, n8n_workflow_1.ensureError)(e);
-            return this.renderCallbackError(res, error.message, 'body' in error ? (0, n8n_workflow_1.jsonStringify)(error.body) : undefined);
+            return this.oauthService.renderCallbackError(res, error.message, 'body' in error ? (0, n8n_workflow_1.jsonStringify)(error.body) : undefined);
         }
     }
 };
@@ -100,12 +80,14 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], OAuth1CredentialController.prototype, "getAuthUri", null);
 __decorate([
-    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: abstract_oauth_controller_1.skipAuthOnOAuthCallback }),
+    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: oauth_service_1.skipAuthOnOAuthCallback }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], OAuth1CredentialController.prototype, "handleCallback", null);
 exports.OAuth1CredentialController = OAuth1CredentialController = __decorate([
-    (0, decorators_1.RestController)('/oauth1-credential')
+    (0, decorators_1.RestController)('/oauth1-credential'),
+    __metadata("design:paramtypes", [oauth_service_1.OauthService,
+        backend_common_1.Logger])
 ], OAuth1CredentialController);
 //# sourceMappingURL=oauth1-credential.controller.js.map

package/dist/controllers/oauth/oauth1-credential.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/oauth2-credential.controller.d.ts

@@ -1,11 +1,14 @@
 import { Response } from 'express';
-import { AbstractOAuthController } from './abstract-oauth.controller';
 import { OAuthRequest } from '../../requests';
-export declare class OAuth2CredentialController extends AbstractOAuthController {
-    oauthVersion: number;
+import { OauthService } from '../../oauth/oauth.service';
+import { Logger } from '@n8n/backend-common';
+import { ExternalHooks } from '../../external-hooks';
+export declare class OAuth2CredentialController {
+    private readonly oauthService;
+    private readonly logger;
+    private readonly externalHooks;
+    constructor(oauthService: OauthService, logger: Logger, externalHooks: ExternalHooks);
     getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string>;
     handleCallback(req: OAuthRequest.OAuth2Credential.Callback, res: Response): Promise<void>;
     private convertCredentialToOptions;
-    private selectGrantTypeAndAuthenticationMethod;
-    private mapGrantTypeAndAuthenticationMethod;
 }

package/dist/controllers/oauth/oauth2-credential.controller.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -48,116 +15,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2CredentialController = void 0;
 const client_oauth2_1 = require("@n8n/client-oauth2");
 const decorators_1 = require("@n8n/decorators");
-const axios_1 = __importDefault(require("axios"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const set_1 = __importDefault(require("lodash/set"));
 const split_1 = __importDefault(require("lodash/split"));
 const n8n_workflow_1 = require("n8n-workflow");
-const pkce_challenge_1 = __importDefault(require("pkce-challenge"));
-const qs = __importStar(require("querystring"));
-const abstract_oauth_controller_1 = require("./abstract-oauth.controller");
-const oauth2_dynamic_client_registration_schema_1 = require("./oauth2-dynamic-client-registration.schema");
-const constants_1 = require("../../constants");
-const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
-let OAuth2CredentialController = class OAuth2CredentialController extends abstract_oauth_controller_1.AbstractOAuthController {
-    constructor() {
-        super(...arguments);
-        this.oauthVersion = 2;
+const oauth_service_1 = require("../../oauth/oauth.service");
+const backend_common_1 = require("@n8n/backend-common");
+const external_hooks_1 = require("../../external-hooks");
+let OAuth2CredentialController = class OAuth2CredentialController {
+    constructor(oauthService, logger, externalHooks) {
+        this.oauthService = oauthService;
+        this.logger = logger;
+        this.externalHooks = externalHooks;
     }
     async getAuthUri(req) {
-        const credential = await this.getCredential(req);
-        const additionalData = await this.getAdditionalData();
-        const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
-        if (decryptedDataOriginal?.scope &&
-            credential.type.includes('OAuth2') &&
-            !constants_1.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE.includes(credential.type)) {
-            delete decryptedDataOriginal.scope;
-        }
-        const oauthCredentials = await this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
-        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 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(', ')}`);
-            }
-            const { authorization_endpoint, token_endpoint, registration_endpoint, scopes_supported } = metadataValidation.data;
-            oauthCredentials.authUrl = authorization_endpoint;
-            oauthCredentials.accessTokenUrl = token_endpoint;
-            toUpdate.authUrl = authorization_endpoint;
-            toUpdate.accessTokenUrl = token_endpoint;
-            const scope = scopes_supported ? scopes_supported.join(' ') : undefined;
-            if (scope) {
-                oauthCredentials.scope = scope;
-                toUpdate.scope = scope;
-            }
-            const { grantType, authentication } = this.selectGrantTypeAndAuthenticationMethod(metadataValidation.data.grant_types_supported ?? ['authorization_code', 'implicit'], metadataValidation.data.token_endpoint_auth_methods_supported ?? ['client_secret_basic'], metadataValidation.data.code_challenge_methods_supported ?? []);
-            oauthCredentials.grantType = grantType;
-            toUpdate.grantType = grantType;
-            if (authentication) {
-                oauthCredentials.authentication = authentication;
-                toUpdate.authentication = authentication;
-            }
-            const { grant_types, token_endpoint_auth_method } = this.mapGrantTypeAndAuthenticationMethod(grantType, authentication);
-            const registerPayload = {
-                redirect_uris: [`${this.baseUrl}/callback`],
-                token_endpoint_auth_method,
-                grant_types,
-                response_types: ['code'],
-                client_name: 'n8n',
-                client_uri: 'https://n8n.io/',
-                scope,
-            };
-            await this.externalHooks.run('oauth2.dynamicClientRegistration', [registerPayload]);
-            const { data: registerResult } = await axios_1.default.post(registration_endpoint, registerPayload);
-            const registrationValidation = oauth2_dynamic_client_registration_schema_1.dynamicClientRegistrationResponseSchema.safeParse(registerResult);
-            if (!registrationValidation.success) {
-                throw new bad_request_error_1.BadRequestError(`Invalid client registration response: ${registrationValidation.error.issues.map((e) => e.message).join(', ')}`);
-            }
-            const { client_id, client_secret } = registrationValidation.data;
-            oauthCredentials.clientId = client_id;
-            toUpdate.clientId = client_id;
-            if (client_secret) {
-                oauthCredentials.clientSecret = client_secret;
-                toUpdate.clientSecret = client_secret;
-            }
-        }
-        const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
-        const oAuthOptions = {
-            ...this.convertCredentialToOptions(oauthCredentials),
-            state,
-        };
-        if (oauthCredentials.authQueryParameters) {
-            oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
-        }
-        await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
-        toUpdate.csrfSecret = csrfSecret;
-        if (oauthCredentials.grantType === 'pkce') {
-            const { code_verifier, code_challenge } = await (0, pkce_challenge_1.default)();
-            oAuthOptions.query = {
-                ...oAuthOptions.query,
-                code_challenge,
-                code_challenge_method: 'S256',
-            };
-            toUpdate.codeVerifier = code_verifier;
-        }
-        await this.encryptAndSaveData(credential, toUpdate);
-        const oAuthObj = new client_oauth2_1.ClientOAuth2(oAuthOptions);
-        const returnUri = oAuthObj.code.getUri();
-        this.logger.debug('OAuth2 authorization url created for credential', {
+        const credential = await this.oauthService.getCredential(req);
+        const uri = await this.oauthService.generateAOauth2AuthUri(credential, {
+            cid: credential.id,
+            origin: 'static-credential',
             userId: req.user.id,
-            credentialId: credential.id,
         });
-        return returnUri.toString();
+        return uri;
     }
     async handleCallback(req, res) {
         try {
             const { code, state: encodedState } = req.query;
             if (!code || !encodedState) {
-                return this.renderCallbackError(res, 'Insufficient parameters for OAuth2 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
+                return this.oauthService.renderCallbackError(res, 'Insufficient parameters for OAuth2 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            const [credential, decryptedDataOriginal, oauthCredentials] = await this.resolveCredential(req);
+            const [credential, decryptedDataOriginal, oauthCredentials, state] = await this.oauthService.resolveCredential(req);
             let options = {};
             const oAuthOptions = this.convertCredentialToOptions(oauthCredentials);
             if (oauthCredentials.grantType === 'pkce') {
@@ -187,15 +73,29 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
                 ...(typeof oauthTokenData === 'object' ? oauthTokenData : {}),
                 ...oauthToken.data,
             };
-            await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
-            this.logger.debug('OAuth2 callback successful for credential', {
-                credentialId: credential.id,
-            });
-            return res.render('oauth-callback');
+            if (!state.origin || state.origin === 'static-credential') {
+                await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
+                this.logger.debug('OAuth2 callback successful for credential', {
+                    credentialId: credential.id,
+                });
+                return res.render('oauth-callback');
+            }
+            if (state.origin === 'dynamic-credential') {
+                if (!state.credentialResolverId || typeof state.credentialResolverId !== 'string') {
+                    return this.oauthService.renderCallbackError(res, 'Credential resolver ID is required');
+                }
+                if (!state.authorizationHeader ||
+                    typeof state.authorizationHeader !== 'string' ||
+                    !state.authorizationHeader.startsWith('Bearer ')) {
+                    return this.oauthService.renderCallbackError(res, 'Authorization header is required');
+                }
+                await this.oauthService.saveDynamicCredential(credential, decryptedDataOriginal, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId);
+                return res.render('oauth-callback');
+            }
         }
         catch (e) {
             const error = (0, n8n_workflow_1.ensureError)(e);
-            return this.renderCallbackError(res, error.message, 'body' in error ? (0, n8n_workflow_1.jsonStringify)(error.body) : undefined);
+            return this.oauthService.renderCallbackError(res, error.message, 'body' in error ? (0, n8n_workflow_1.jsonStringify)(error.body) : undefined);
         }
     }
     convertCredentialToOptions(credential) {
@@ -205,7 +105,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             accessTokenUri: credential.accessTokenUrl ?? '',
             authorizationUri: credential.authUrl ?? '',
             authentication: credential.authentication ?? 'header',
-            redirectUri: `${this.baseUrl}/callback`,
+            redirectUri: `${this.oauthService.getBaseUrl(2)}/callback`,
             scopes: (0, split_1.default)(credential.scope ?? 'openid', ','),
             scopesSeparator: credential.scope?.includes(',') ? ',' : ' ',
             ignoreSSLIssues: credential.ignoreSSLIssues ?? false,
@@ -219,47 +119,6 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
         }
         return options;
     }
-    selectGrantTypeAndAuthenticationMethod(grantTypes, tokenEndpointAuthMethods, codeChallengeMethods) {
-        if (grantTypes.includes('authorization_code') && grantTypes.includes('refresh_token')) {
-            if (codeChallengeMethods.includes('S256')) {
-                return { grantType: 'pkce' };
-            }
-            if (tokenEndpointAuthMethods.includes('client_secret_basic')) {
-                return { grantType: 'authorizationCode', authentication: 'header' };
-            }
-            if (tokenEndpointAuthMethods.includes('client_secret_post')) {
-                return { grantType: 'authorizationCode', authentication: 'body' };
-            }
-        }
-        if (grantTypes.includes('client_credentials')) {
-            if (tokenEndpointAuthMethods.includes('client_secret_basic')) {
-                return { grantType: 'clientCredentials', authentication: 'header' };
-            }
-            if (tokenEndpointAuthMethods.includes('client_secret_post')) {
-                return { grantType: 'clientCredentials', authentication: 'body' };
-            }
-        }
-        throw new bad_request_error_1.BadRequestError('No supported grant type and authentication method found');
-    }
-    mapGrantTypeAndAuthenticationMethod(grantType, authentication) {
-        if (grantType === 'pkce') {
-            return {
-                grant_types: ['authorization_code', 'refresh_token'],
-                token_endpoint_auth_method: 'none',
-            };
-        }
-        const tokenEndpointAuthMethod = authentication === 'header' ? 'client_secret_basic' : 'client_secret_post';
-        if (grantType === 'authorizationCode') {
-            return {
-                grant_types: ['authorization_code', 'refresh_token'],
-                token_endpoint_auth_method: tokenEndpointAuthMethod,
-            };
-        }
-        return {
-            grant_types: ['client_credentials'],
-            token_endpoint_auth_method: tokenEndpointAuthMethod,
-        };
-    }
 };
 exports.OAuth2CredentialController = OAuth2CredentialController;
 __decorate([
@@ -269,12 +128,15 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], OAuth2CredentialController.prototype, "getAuthUri", null);
 __decorate([
-    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: abstract_oauth_controller_1.skipAuthOnOAuthCallback }),
+    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: oauth_service_1.skipAuthOnOAuthCallback }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], OAuth2CredentialController.prototype, "handleCallback", null);
 exports.OAuth2CredentialController = OAuth2CredentialController = __decorate([
-    (0, decorators_1.RestController)('/oauth2-credential')
+    (0, decorators_1.RestController)('/oauth2-credential'),
+    __metadata("design:paramtypes", [oauth_service_1.OauthService,
+        backend_common_1.Logger,
+        external_hooks_1.ExternalHooks])
 ], OAuth2CredentialController);
 //# sourceMappingURL=oauth2-credential.controller.js.map

package/dist/controllers/oauth/oauth2-credential.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/owner.controller.d.ts

@@ -1,24 +1,18 @@
 import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
-import { Logger } from '@n8n/backend-common';
-import { AuthenticatedRequest, SettingsRepository, UserRepository } from '@n8n/db';
+import { AuthenticatedRequest } from '@n8n/db';
 import { Response } from 'express';
 import { AuthService } from '../auth/auth.service';
-import { EventService } from '../events/event.service';
 import { PostHogClient } from '../posthog';
 import { BannerService } from '../services/banner.service';
-import { PasswordUtility } from '../services/password.utility';
 import { UserService } from '../services/user.service';
+import { OwnershipService } from '../services/ownership.service';
 export declare class OwnerController {
-    private readonly logger;
-    private readonly eventService;
-    private readonly settingsRepository;
     private readonly authService;
     private readonly bannerService;
     private readonly userService;
-    private readonly passwordUtility;
     private readonly postHog;
-    private readonly userRepository;
-    constructor(logger: Logger, eventService: EventService, settingsRepository: SettingsRepository, authService: AuthService, bannerService: BannerService, userService: UserService, passwordUtility: PasswordUtility, postHog: PostHogClient, userRepository: UserRepository);
+    private readonly ownershipService;
+    constructor(authService: AuthService, bannerService: BannerService, userService: UserService, postHog: PostHogClient, ownershipService: OwnershipService);
     setupOwner(req: AuthenticatedRequest, res: Response, payload: OwnerSetupRequestDto): Promise<import("@n8n/db").PublicUser>;
     dismissBanner(_req: AuthenticatedRequest, _res: Response, payload: DismissBannerRequestDto): Promise<void>;
 }