n8n 1.43.1 → 1.44.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/n8n +11 -8
- package/dist/ActiveWorkflowManager.js +4 -2
- package/dist/ActiveWorkflowManager.js.map +1 -1
- package/dist/Db.d.ts +0 -1
- package/dist/Db.js +3 -21
- package/dist/Db.js.map +1 -1
- package/dist/PublicApi/index.js +1 -5
- package/dist/PublicApi/index.js.map +1 -1
- package/dist/Queue.d.ts +4 -1
- package/dist/Queue.js +2 -2
- package/dist/Queue.js.map +1 -1
- package/dist/Server.js +1 -1
- package/dist/Server.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/db/revert.d.ts +2 -3
- package/dist/commands/db/revert.js +26 -18
- package/dist/commands/db/revert.js.map +1 -1
- package/dist/commands/start.js +1 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/worker.js +14 -5
- package/dist/commands/worker.js.map +1 -1
- package/dist/controllers/me.controller.d.ts +2 -1
- package/dist/controllers/me.controller.js +14 -4
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/oauth/abstractOAuth.controller.d.ts +9 -0
- package/dist/controllers/oauth/abstractOAuth.controller.js +29 -0
- package/dist/controllers/oauth/abstractOAuth.controller.js.map +1 -1
- package/dist/controllers/oauth/oAuth1Credential.controller.js +27 -25
- package/dist/controllers/oauth/oAuth1Credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oAuth2Credential.controller.d.ts +0 -3
- package/dist/controllers/oauth/oAuth2Credential.controller.js +17 -44
- package/dist/controllers/oauth/oAuth2Credential.controller.js.map +1 -1
- package/dist/databases/repositories/execution.repository.js +5 -5
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/utils/migrationHelpers.js +1 -1
- package/dist/databases/utils/migrationHelpers.js.map +1 -1
- package/dist/environments/sourceControl/sourceControlGit.service.ee.d.ts +1 -0
- package/dist/environments/sourceControl/sourceControlGit.service.ee.js +14 -0
- package/dist/environments/sourceControl/sourceControlGit.service.ee.js.map +1 -1
- package/dist/eventbus/EventMessageClasses/index.d.ts +0 -7
- package/dist/eventbus/MessageEventBus/MessageEventBus.d.ts +1 -2
- package/dist/eventbus/MessageEventBus/MessageEventBus.js +0 -34
- package/dist/eventbus/MessageEventBus/MessageEventBus.js.map +1 -1
- package/dist/eventbus/eventBus.controller.d.ts +2 -7
- package/dist/eventbus/eventBus.controller.js +2 -37
- package/dist/eventbus/eventBus.controller.js.map +1 -1
- package/dist/permissions/global-roles.js +0 -2
- package/dist/permissions/global-roles.js.map +1 -1
- package/dist/requests.d.ts +1 -1
- package/dist/services/frontend.service.js +2 -1
- package/dist/services/frontend.service.js.map +1 -1
- package/package.json +17 -17
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Command } from '@oclif/core';
|
|
2
|
-
import
|
|
3
|
-
import { DataSource as Connection } from '@n8n/typeorm';
|
|
2
|
+
import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm';
|
|
4
3
|
import { Logger } from '../../Logger';
|
|
5
|
-
export declare function main(
|
|
4
|
+
export declare function main(logger: Logger, connection: Connection, migrationExecutor: MigrationExecutor): Promise<void>;
|
|
6
5
|
export declare class DbRevertMigrationCommand extends Command {
|
|
7
6
|
static description: string;
|
|
8
7
|
static examples: string[];
|
|
@@ -1,31 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.DbRevertMigrationCommand = exports.main = void 0;
|
|
7
4
|
const core_1 = require("@oclif/core");
|
|
8
5
|
const typeorm_1 = require("@n8n/typeorm");
|
|
9
6
|
const typedi_1 = require("typedi");
|
|
10
7
|
const Logger_1 = require("../../Logger");
|
|
11
|
-
const Db_1 = require("../../Db");
|
|
12
8
|
const config_1 = require("../../databases/config");
|
|
13
9
|
const migrationHelpers_1 = require("../../databases/utils/migrationHelpers");
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
10
|
+
async function main(logger, connection, migrationExecutor) {
|
|
11
|
+
const executedMigrations = await migrationExecutor.getExecutedMigrations();
|
|
12
|
+
const lastExecutedMigration = executedMigrations.at(0);
|
|
13
|
+
if (lastExecutedMigration === undefined) {
|
|
14
|
+
logger.error("Cancelled command. The database was never migrated. Are you sure you're connected to the right database?.");
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const lastMigrationInstance = connection.migrations.find((m) => {
|
|
18
|
+
var _a;
|
|
19
|
+
const name1 = (_a = m.name) !== null && _a !== void 0 ? _a : m.constructor.name;
|
|
20
|
+
const name2 = lastExecutedMigration.name;
|
|
21
|
+
return name1 === name2;
|
|
22
|
+
});
|
|
23
|
+
if (lastMigrationInstance === undefined) {
|
|
24
|
+
logger.error(`The last migration that was executed is "${lastExecutedMigration.name}", but I could not find that migration's code in the currently installed version of n8n.`);
|
|
25
|
+
logger.error('This usually means that you downgraded n8n before running `n8n db:revert`. Please upgrade n8n again and run `n8n db:revert` and then downgrade again.');
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
|
-
if (!
|
|
28
|
-
|
|
28
|
+
if (!lastMigrationInstance.down) {
|
|
29
|
+
const message = lastMigrationInstance.name
|
|
30
|
+
? `Cancelled command. The last migration "${lastMigrationInstance.name}" was irreversible.`
|
|
31
|
+
: 'Cancelled command. The last migration was irreversible.';
|
|
32
|
+
logger.error(message);
|
|
29
33
|
return;
|
|
30
34
|
}
|
|
31
35
|
await connection.undoLastMigration();
|
|
@@ -49,7 +53,11 @@ class DbRevertMigrationCommand extends core_1.Command {
|
|
|
49
53
|
dropSchema: false,
|
|
50
54
|
logging: ['query', 'error', 'schema'],
|
|
51
55
|
};
|
|
52
|
-
|
|
56
|
+
const connection = new typeorm_1.DataSource(connectionOptions);
|
|
57
|
+
await connection.initialize();
|
|
58
|
+
const migrationExecutor = new typeorm_1.MigrationExecutor(connection);
|
|
59
|
+
connectionOptions.migrations.forEach(migrationHelpers_1.wrapMigration);
|
|
60
|
+
return await main(this.logger, connection, migrationExecutor);
|
|
53
61
|
}
|
|
54
62
|
async catch(error) {
|
|
55
63
|
this.logger.error('Error reverting last migration. See log messages for details.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../src/commands/db/revert.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../src/commands/db/revert.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.js
CHANGED
|
@@ -108,6 +108,7 @@ class Start extends BaseCommand_1.BaseCommand {
|
|
|
108
108
|
(0, fs_1.createReadStream)(filePath, 'utf-8'),
|
|
109
109
|
(0, replacestream_1.default)('/{{BASE_PATH}}/', n8nPath, { ignoreCase: false }),
|
|
110
110
|
(0, replacestream_1.default)('/%7B%7BBASE_PATH%7D%7D/', n8nPath, { ignoreCase: false }),
|
|
111
|
+
(0, replacestream_1.default)('/%257B%257BBASE_PATH%257D%257D/', n8nPath, { ignoreCase: false }),
|
|
111
112
|
(0, replacestream_1.default)('/static/', n8nPath + 'static/', { ignoreCase: false }),
|
|
112
113
|
];
|
|
113
114
|
if (filePath.endsWith('index.html')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/worker.js
CHANGED
|
@@ -55,15 +55,15 @@ class Worker extends BaseCommand_1.BaseCommand {
|
|
|
55
55
|
async stopProcess() {
|
|
56
56
|
var _a;
|
|
57
57
|
this.logger.info('Stopping n8n...');
|
|
58
|
-
await Worker.jobQueue.pause(true);
|
|
58
|
+
await Worker.jobQueue.pause({ isLocal: true, doNotWaitActive: true });
|
|
59
59
|
try {
|
|
60
60
|
await ((_a = this.externalHooks) === null || _a === void 0 ? void 0 : _a.run('n8n.stop', []));
|
|
61
|
-
const
|
|
61
|
+
const hardStopTimeMs = Date.now() + this.gracefulShutdownTimeoutInS * 1000;
|
|
62
62
|
let count = 0;
|
|
63
63
|
while (Object.keys(Worker.runningJobs).length !== 0) {
|
|
64
64
|
if (count++ % 4 === 0) {
|
|
65
|
-
const waitLeft = Math.ceil((
|
|
66
|
-
this.logger.info(`Waiting for ${Object.keys(Worker.runningJobs).length} active executions to finish... (wait ${waitLeft} more seconds)`);
|
|
65
|
+
const waitLeft = Math.ceil((hardStopTimeMs - Date.now()) / 1000);
|
|
66
|
+
this.logger.info(`Waiting for ${Object.keys(Worker.runningJobs).length} active executions to finish... (max wait ${waitLeft} more seconds)`);
|
|
67
67
|
}
|
|
68
68
|
await (0, n8n_workflow_1.sleep)(500);
|
|
69
69
|
}
|
|
@@ -167,7 +167,7 @@ class Worker extends BaseCommand_1.BaseCommand {
|
|
|
167
167
|
constructor(argv, cmdConfig) {
|
|
168
168
|
super(argv, cmdConfig);
|
|
169
169
|
if (!process.env.N8N_ENCRYPTION_KEY) {
|
|
170
|
-
throw new n8n_workflow_1.ApplicationError('Missing encryption key. Worker started without the required N8N_ENCRYPTION_KEY env var. More information: https://docs.n8n.io/hosting/
|
|
170
|
+
throw new n8n_workflow_1.ApplicationError('Missing encryption key. Worker started without the required N8N_ENCRYPTION_KEY env var. More information: https://docs.n8n.io/hosting/configuration/configuration-examples/encryption-key/');
|
|
171
171
|
}
|
|
172
172
|
this.setInstanceType('worker');
|
|
173
173
|
this.setInstanceQueueModeId();
|
|
@@ -338,6 +338,15 @@ class Worker extends BaseCommand_1.BaseCommand {
|
|
|
338
338
|
if (config_1.default.getEnv('queue.health.active')) {
|
|
339
339
|
await this.setupHealthMonitor();
|
|
340
340
|
}
|
|
341
|
+
if (process.stdout.isTTY) {
|
|
342
|
+
process.stdin.setRawMode(true);
|
|
343
|
+
process.stdin.resume();
|
|
344
|
+
process.stdin.setEncoding('utf8');
|
|
345
|
+
process.stdin.on('data', (key) => {
|
|
346
|
+
if (key.charCodeAt(0) === 3)
|
|
347
|
+
process.kill(process.pid, 'SIGINT');
|
|
348
|
+
});
|
|
349
|
+
}
|
|
341
350
|
await new Promise(() => { });
|
|
342
351
|
}
|
|
343
352
|
async catch(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Response } from 'express';
|
|
1
|
+
import { type RequestHandler, Response } from 'express';
|
|
2
2
|
import { AuthService } from '../auth/auth.service';
|
|
3
3
|
import { PasswordUtility } from '../services/password.utility';
|
|
4
4
|
import type { User } from '../databases/entities/User';
|
|
@@ -9,6 +9,7 @@ import { Logger } from '../Logger';
|
|
|
9
9
|
import { ExternalHooks } from '../ExternalHooks';
|
|
10
10
|
import { InternalHooks } from '../InternalHooks';
|
|
11
11
|
import { UserRepository } from '../databases/repositories/user.repository';
|
|
12
|
+
export declare const isApiEnabledMiddleware: RequestHandler;
|
|
12
13
|
export declare class MeController {
|
|
13
14
|
private readonly logger;
|
|
14
15
|
private readonly externalHooks;
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.MeController = void 0;
|
|
15
|
+
exports.MeController = exports.isApiEnabledMiddleware = void 0;
|
|
16
16
|
const validator_1 = __importDefault(require("validator"));
|
|
17
17
|
const class_transformer_1 = require("class-transformer");
|
|
18
18
|
const crypto_1 = require("crypto");
|
|
@@ -28,6 +28,16 @@ const ExternalHooks_1 = require("../ExternalHooks");
|
|
|
28
28
|
const InternalHooks_1 = require("../InternalHooks");
|
|
29
29
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
30
30
|
const user_repository_1 = require("../databases/repositories/user.repository");
|
|
31
|
+
const PublicApi_1 = require("../PublicApi");
|
|
32
|
+
const isApiEnabledMiddleware = (_, res, next) => {
|
|
33
|
+
if ((0, PublicApi_1.isApiEnabled)()) {
|
|
34
|
+
next();
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
res.status(404).end();
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
exports.isApiEnabledMiddleware = isApiEnabledMiddleware;
|
|
31
41
|
let MeController = class MeController {
|
|
32
42
|
constructor(logger, externalHooks, internalHooks, authService, userService, passwordUtility, userRepository) {
|
|
33
43
|
this.logger = logger;
|
|
@@ -182,19 +192,19 @@ __decorate([
|
|
|
182
192
|
__metadata("design:returntype", Promise)
|
|
183
193
|
], MeController.prototype, "storeSurveyAnswers", null);
|
|
184
194
|
__decorate([
|
|
185
|
-
(0, decorators_1.Post)('/api-key'),
|
|
195
|
+
(0, decorators_1.Post)('/api-key', { middlewares: [exports.isApiEnabledMiddleware] }),
|
|
186
196
|
__metadata("design:type", Function),
|
|
187
197
|
__metadata("design:paramtypes", [Object]),
|
|
188
198
|
__metadata("design:returntype", Promise)
|
|
189
199
|
], MeController.prototype, "createAPIKey", null);
|
|
190
200
|
__decorate([
|
|
191
|
-
(0, decorators_1.Get)('/api-key'),
|
|
201
|
+
(0, decorators_1.Get)('/api-key', { middlewares: [exports.isApiEnabledMiddleware] }),
|
|
192
202
|
__metadata("design:type", Function),
|
|
193
203
|
__metadata("design:paramtypes", [Object]),
|
|
194
204
|
__metadata("design:returntype", Promise)
|
|
195
205
|
], MeController.prototype, "getAPIKey", null);
|
|
196
206
|
__decorate([
|
|
197
|
-
(0, decorators_1.Delete)('/api-key'),
|
|
207
|
+
(0, decorators_1.Delete)('/api-key', { middlewares: [exports.isApiEnabledMiddleware] }),
|
|
198
208
|
__metadata("design:type", Function),
|
|
199
209
|
__metadata("design:paramtypes", [Object]),
|
|
200
210
|
__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,yDAAoD;AAEpD,mCAAqC;AAErC,sDAAkD;AAClD,6CAAwE;AACxE,kEAA8D;AAC9D,qDAAkD;AAElD,yCAKoB;AAEpB,wDAAkE;AAClE,0DAAsD;AACtD,qCAAkC;AAClC,mDAAgD;AAChD,mDAAgD;AAChD,kFAA6E;AAC7E,8EAA0E;
|
|
1
|
+
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,yDAAoD;AAEpD,mCAAqC;AAErC,sDAAkD;AAClD,6CAAwE;AACxE,kEAA8D;AAC9D,qDAAkD;AAElD,yCAKoB;AAEpB,wDAAkE;AAClE,0DAAsD;AACtD,qCAAkC;AAClC,mDAAgD;AAChD,mDAAgD;AAChD,kFAA6E;AAC7E,8EAA0E;AAC1E,2CAA2C;AAEpC,MAAM,sBAAsB,GAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,IAAA,wBAAY,GAAE,EAAE,CAAC;QACpB,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;AACF,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAGK,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,MAAc,EACd,aAA4B,EAC5B,aAA4B,EAC5B,WAAwB,EACxB,WAAwB,EACxB,eAAgC,EAChC,cAA8B;QAN9B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAME,AAAN,KAAK,CAAC,iBAAiB,CAAC,GAAyB,EAAE,GAAa;QAC/D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrD,MAAM,OAAO,GAAG,IAAA,mCAAe,EAAC,4BAAiB,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhG,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,OAAO;aACP,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CAAC,oBAAoB,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,mBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,EAAE;gBAC5F,MAAM;gBACN,YAAY,EAAE,KAAK;aACnB,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CAAC,uBAAuB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;QAG9B,IAAI,IAAA,sCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,4EAA4E,EAC5E;oBACC,MAAM;oBACN,OAAO;iBACP,CACD,CAAC;gBACF,MAAM,IAAI,mCAAe,CAAC,sCAAsC,CAAC,CAAC;YACnE,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAE3F,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;YACpC,IAAI;YACJ,cAAc,EAAE,WAAW;SAC3B,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;QAEhF,OAAO,UAAU,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,cAAc,CAAC,GAAuB,EAAE,GAAa;QAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAGlD,IAAI,IAAA,sCAAwB,GAAE,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8DAA8D,EAAE;gBACjF,MAAM,EAAE,IAAI,CAAC,EAAE;aACf,CAAC,CAAC;YACH,MAAM,IAAI,mCAAe,CACxB,8EAA8E,CAC9E,CAAC;QACH,CAAC;QAED,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC5E,MAAM,IAAI,mCAAe,CAAC,kBAAkB,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,IAAI,mCAAe,CAAC,6BAA6B,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9F,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,MAAM,IAAI,mCAAe,CAAC,yCAAyC,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAEvE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9D,KAAK,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;YACpC,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,CAAC,UAAU,CAAC;SAC5B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEhG,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,kBAAkB,CAAC,GAA4B;QACpD,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC;QAE7C,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,8EAA8E,EAC9E;gBACC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aACnB,CACD,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,uCAAuC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC7B;YACC,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACf,sBAAsB;SACtB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9E,KAAK,IAAI,CAAC,aAAa,CAAC,gCAAgC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAE9F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,MAAM,GAAG,WAAW,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAE5D,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEvD,KAAK,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;YACvC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QAEH,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CAAC,GAAyB;QACxC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7D,KAAK,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;YACvC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAMK,AAAN,KAAK,CAAC,yBAAyB,CAAC,GAAiC;QAChE,MAAM,OAAO,GAAG,IAAA,mCAAe,EAAC,oCAAyB,EAAE,GAAG,CAAC,IAAI,EAAE;YACpE,uBAAuB,EAAE,IAAI;SAC7B,CAAC,CAAC;QACH,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAExB,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD,CAAA;AAzNY,oCAAY;AAelB;IADL,IAAA,kBAAK,EAAC,GAAG,CAAC;;;;qDA4DV;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;kDA6ClB;AAMK;IADL,IAAA,iBAAI,EAAC,SAAS,CAAC;;;;sDA2Bf;AAMK;IADL,IAAA,iBAAI,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;gDAY3D;AAMK;IADL,IAAA,gBAAG,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;6CAG1D;AAMK;IADL,IAAA,mBAAM,EAAC,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;gDAU7D;AAMK;IADL,IAAA,kBAAK,EAAC,WAAW,CAAC;;;;6DAelB;uBAxNW,YAAY;IADxB,IAAA,2BAAc,EAAC,KAAK,CAAC;qCAGK,eAAM;QACC,6BAAa;QACb,6BAAa;QACf,0BAAW;QACX,0BAAW;QACP,kCAAe;QAChB,gCAAc;GARpC,YAAY,CAyNxB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Response } from 'express';
|
|
1
2
|
import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
|
|
2
3
|
import type { CredentialsEntity } from '../../databases/entities/CredentialsEntity';
|
|
3
4
|
import type { User } from '../../databases/entities/User';
|
|
@@ -9,6 +10,10 @@ import { CredentialsHelper } from '../../CredentialsHelper';
|
|
|
9
10
|
import { Logger } from '../../Logger';
|
|
10
11
|
import { ExternalHooks } from '../../ExternalHooks';
|
|
11
12
|
import { UrlService } from '../../services/url.service';
|
|
13
|
+
export interface CsrfStateParam {
|
|
14
|
+
cid: string;
|
|
15
|
+
token: string;
|
|
16
|
+
}
|
|
12
17
|
export declare abstract class AbstractOAuthController {
|
|
13
18
|
protected readonly logger: Logger;
|
|
14
19
|
protected readonly externalHooks: ExternalHooks;
|
|
@@ -25,4 +30,8 @@ export declare abstract class AbstractOAuthController {
|
|
|
25
30
|
protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): T;
|
|
26
31
|
protected encryptAndSaveData(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject): Promise<void>;
|
|
27
32
|
protected getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null>;
|
|
33
|
+
protected createCsrfState(credentialsId: string): [string, string];
|
|
34
|
+
protected decodeCsrfState(encodedState: string): CsrfStateParam;
|
|
35
|
+
protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject, state: CsrfStateParam): boolean;
|
|
36
|
+
protected renderCallbackError(res: Response, message: string, reason?: string): void;
|
|
28
37
|
}
|
|
@@ -37,7 +37,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.AbstractOAuthController = void 0;
|
|
39
39
|
const typedi_1 = require("typedi");
|
|
40
|
+
const csrf_1 = __importDefault(require("csrf"));
|
|
40
41
|
const n8n_core_1 = require("n8n-core");
|
|
42
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
41
43
|
const config_1 = __importDefault(require("../../config"));
|
|
42
44
|
const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
|
|
43
45
|
const sharedCredentials_repository_1 = require("../../databases/repositories/sharedCredentials.repository");
|
|
@@ -94,6 +96,33 @@ let AbstractOAuthController = class AbstractOAuthController {
|
|
|
94
96
|
async getCredentialWithoutUser(credentialId) {
|
|
95
97
|
return await this.credentialsRepository.findOneBy({ id: credentialId });
|
|
96
98
|
}
|
|
99
|
+
createCsrfState(credentialsId) {
|
|
100
|
+
const token = new csrf_1.default();
|
|
101
|
+
const csrfSecret = token.secretSync();
|
|
102
|
+
const state = {
|
|
103
|
+
token: token.create(csrfSecret),
|
|
104
|
+
cid: credentialsId,
|
|
105
|
+
};
|
|
106
|
+
return [csrfSecret, Buffer.from(JSON.stringify(state)).toString('base64')];
|
|
107
|
+
}
|
|
108
|
+
decodeCsrfState(encodedState) {
|
|
109
|
+
const errorMessage = 'Invalid state format';
|
|
110
|
+
const decoded = (0, n8n_workflow_1.jsonParse)(Buffer.from(encodedState, 'base64').toString(), {
|
|
111
|
+
errorMessage,
|
|
112
|
+
});
|
|
113
|
+
if (typeof decoded.cid !== 'string' || typeof decoded.token !== 'string') {
|
|
114
|
+
throw new n8n_workflow_1.ApplicationError(errorMessage);
|
|
115
|
+
}
|
|
116
|
+
return decoded;
|
|
117
|
+
}
|
|
118
|
+
verifyCsrfState(decrypted, state) {
|
|
119
|
+
const token = new csrf_1.default();
|
|
120
|
+
return (decrypted.csrfSecret === undefined ||
|
|
121
|
+
!token.verify(decrypted.csrfSecret, state.token));
|
|
122
|
+
}
|
|
123
|
+
renderCallbackError(res, message, reason) {
|
|
124
|
+
res.render('oauth-error-callback', { error: { message, reason } });
|
|
125
|
+
}
|
|
97
126
|
};
|
|
98
127
|
exports.AbstractOAuthController = AbstractOAuthController;
|
|
99
128
|
exports.AbstractOAuthController = AbstractOAuthController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstractOAuth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstractOAuth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,uCAAuC;AAEvC,sDAA8B;AAG9B,oFAAgF;AAChF,gGAA4F;AAG5F,2CAAsD;AACtD,2DAAwD;AACxD,+FAAiF;AACjF,qCAAkC;AAClC,mDAAgD;AAChD,wDAAoD;AACpD,kFAA6E;AAC7E,8EAAyE;
|
|
1
|
+
{"version":3,"file":"abstractOAuth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstractOAuth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,10 @@ exports.OAuth1CredentialController = void 0;
|
|
|
16
16
|
const axios_1 = __importDefault(require("axios"));
|
|
17
17
|
const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
|
|
18
18
|
const crypto_1 = require("crypto");
|
|
19
|
-
const constants_1 = require("../../constants");
|
|
20
19
|
const decorators_1 = require("../../decorators");
|
|
21
20
|
const ResponseHelper_1 = require("../../ResponseHelper");
|
|
22
21
|
const abstractOAuth_controller_1 = require("./abstractOAuth.controller");
|
|
23
22
|
const not_found_error_1 = require("../../errors/response-errors/not-found.error");
|
|
24
|
-
const service_unavailable_error_1 = require("../../errors/response-errors/service-unavailable.error");
|
|
25
23
|
const algorithmMap = {
|
|
26
24
|
'HMAC-SHA256': 'sha256',
|
|
27
25
|
'HMAC-SHA512': 'sha512',
|
|
@@ -37,6 +35,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
37
35
|
const additionalData = await this.getAdditionalData(req.user);
|
|
38
36
|
const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
|
|
39
37
|
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
38
|
+
const [csrfSecret, state] = this.createCsrfState(credential.id);
|
|
40
39
|
const signatureMethod = oauthCredentials.signatureMethod;
|
|
41
40
|
const oAuthOptions = {
|
|
42
41
|
consumer: {
|
|
@@ -51,7 +50,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
51
50
|
},
|
|
52
51
|
};
|
|
53
52
|
const oauthRequestData = {
|
|
54
|
-
oauth_callback: `${this.baseUrl}/callback?
|
|
53
|
+
oauth_callback: `${this.baseUrl}/callback?state=${state}`,
|
|
55
54
|
};
|
|
56
55
|
await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
|
|
57
56
|
const oauth = new oauth_1_0a_1.default(oAuthOptions);
|
|
@@ -66,6 +65,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
66
65
|
const paramsParser = new URLSearchParams(response);
|
|
67
66
|
const responseJson = Object.fromEntries(paramsParser.entries());
|
|
68
67
|
const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
|
|
68
|
+
decryptedDataOriginal.csrfSecret = csrfSecret;
|
|
69
69
|
await this.encryptAndSaveData(credential, decryptedDataOriginal);
|
|
70
70
|
this.logger.verbose('OAuth1 authorization successful for new credential', {
|
|
71
71
|
userId: req.user.id,
|
|
@@ -74,29 +74,35 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
74
74
|
return returnUri;
|
|
75
75
|
}
|
|
76
76
|
async handleCallback(req, res) {
|
|
77
|
-
var _a
|
|
77
|
+
var _a;
|
|
78
|
+
const userId = (_a = req.user) === null || _a === void 0 ? void 0 : _a.id;
|
|
78
79
|
try {
|
|
79
|
-
const { oauth_verifier, oauth_token,
|
|
80
|
-
if (!oauth_verifier || !oauth_token) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
return (0, ResponseHelper_1.sendErrorResponse)(res, errorResponse);
|
|
80
|
+
const { oauth_verifier, oauth_token, state: encodedState } = req.query;
|
|
81
|
+
if (!oauth_verifier || !oauth_token || !encodedState) {
|
|
82
|
+
return this.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
|
|
83
|
+
}
|
|
84
|
+
let state;
|
|
85
|
+
try {
|
|
86
|
+
state = this.decodeCsrfState(encodedState);
|
|
87
87
|
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
return this.renderCallbackError(res, error.message);
|
|
90
|
+
}
|
|
91
|
+
const credentialId = state.cid;
|
|
88
92
|
const credential = await this.getCredentialWithoutUser(credentialId);
|
|
89
93
|
if (!credential) {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
});
|
|
94
|
-
const errorResponse = new not_found_error_1.NotFoundError(constants_1.RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
|
|
95
|
-
return (0, ResponseHelper_1.sendErrorResponse)(res, errorResponse);
|
|
94
|
+
const errorMessage = 'OAuth1 callback failed because of insufficient permissions';
|
|
95
|
+
this.logger.error(errorMessage, { userId, credentialId });
|
|
96
|
+
return this.renderCallbackError(res, errorMessage);
|
|
96
97
|
}
|
|
97
98
|
const additionalData = await this.getAdditionalData(req.user);
|
|
98
99
|
const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
|
|
99
100
|
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
101
|
+
if (this.verifyCsrfState(decryptedDataOriginal, state)) {
|
|
102
|
+
const errorMessage = 'The OAuth1 callback state is invalid!';
|
|
103
|
+
this.logger.debug(errorMessage, { userId, credentialId });
|
|
104
|
+
return this.renderCallbackError(res, errorMessage);
|
|
105
|
+
}
|
|
100
106
|
const options = {
|
|
101
107
|
method: 'POST',
|
|
102
108
|
url: oauthCredentials.accessTokenUrl,
|
|
@@ -110,10 +116,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
110
116
|
oauthToken = await axios_1.default.request(options);
|
|
111
117
|
}
|
|
112
118
|
catch (error) {
|
|
113
|
-
this.logger.error('Unable to fetch tokens for OAuth1 callback', {
|
|
114
|
-
userId: (_c = req.user) === null || _c === void 0 ? void 0 : _c.id,
|
|
115
|
-
credentialId,
|
|
116
|
-
});
|
|
119
|
+
this.logger.error('Unable to fetch tokens for OAuth1 callback', { userId, credentialId });
|
|
117
120
|
const errorResponse = new not_found_error_1.NotFoundError('Unable to get access tokens!');
|
|
118
121
|
return (0, ResponseHelper_1.sendErrorResponse)(res, errorResponse);
|
|
119
122
|
}
|
|
@@ -122,15 +125,14 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
122
125
|
decryptedDataOriginal.oauthTokenData = oauthTokenJson;
|
|
123
126
|
await this.encryptAndSaveData(credential, decryptedDataOriginal);
|
|
124
127
|
this.logger.verbose('OAuth1 callback successful for new credential', {
|
|
125
|
-
userId
|
|
128
|
+
userId,
|
|
126
129
|
credentialId,
|
|
127
130
|
});
|
|
128
131
|
return res.render('oauth-callback');
|
|
129
132
|
}
|
|
130
133
|
catch (error) {
|
|
131
134
|
this.logger.error('OAuth1 callback failed because of insufficient user permissions', {
|
|
132
|
-
userId
|
|
133
|
-
credentialId: req.query.cid,
|
|
135
|
+
userId,
|
|
134
136
|
});
|
|
135
137
|
return (0, ResponseHelper_1.sendErrorResponse)(res, error);
|
|
136
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oAuth1Credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oAuth1Credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,kDAA0B;AAE1B,4DAAsC;AACtC,mCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"oAuth1Credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oAuth1Credential.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,4 @@ export declare class OAuth2CredentialController extends AbstractOAuthController
|
|
|
6
6
|
getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string>;
|
|
7
7
|
handleCallback(req: OAuthRequest.OAuth2Credential.Callback, res: Response): Promise<void>;
|
|
8
8
|
private convertCredentialToOptions;
|
|
9
|
-
private renderCallbackError;
|
|
10
|
-
private createCsrfState;
|
|
11
|
-
private decodeCsrfState;
|
|
12
9
|
}
|