n8n 1.100.2 → 1.101.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/dist/abstract-server.d.ts +1 -1
- package/dist/abstract-server.js +4 -4
- package/dist/abstract-server.js.map +1 -1
- package/dist/active-executions.d.ts +2 -1
- package/dist/active-executions.js +20 -0
- package/dist/active-executions.js.map +1 -1
- package/dist/auth/auth.service.d.ts +1 -2
- package/dist/auth/auth.service.js +7 -6
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/collaboration/collaboration.state.js +1 -1
- package/dist/collaboration/collaboration.state.js.map +1 -1
- package/dist/commands/base-command.d.ts +1 -1
- package/dist/commands/base-command.js +2 -2
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/db/revert.js +1 -2
- package/dist/commands/db/revert.js.map +1 -1
- package/dist/config/index.d.ts +0 -3
- package/dist/config/schema.d.ts +0 -18
- package/dist/config/schema.js +0 -18
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +0 -22
- package/dist/constants.js +4 -25
- package/dist/constants.js.map +1 -1
- package/dist/controller.registry.d.ts +3 -1
- package/dist/controller.registry.js +11 -3
- package/dist/controller.registry.js.map +1 -1
- package/dist/controllers/ai.controller.d.ts +1 -1
- package/dist/controllers/ai.controller.js.map +1 -1
- package/dist/controllers/api-keys.controller.d.ts +1 -1
- package/dist/controllers/api-keys.controller.js.map +1 -1
- package/dist/controllers/auth.controller.d.ts +2 -2
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/cta.controller.d.ts +1 -1
- package/dist/controllers/cta.controller.js.map +1 -1
- package/dist/controllers/dynamic-node-parameters.controller.d.ts +1 -1
- package/dist/controllers/dynamic-node-parameters.controller.js.map +1 -1
- package/dist/controllers/e2e.controller.d.ts +65 -0
- package/dist/controllers/e2e.controller.js +271 -0
- package/dist/controllers/e2e.controller.js.map +1 -0
- package/dist/controllers/folder.controller.d.ts +1 -1
- package/dist/controllers/folder.controller.js.map +1 -1
- package/dist/controllers/invitation.controller.d.ts +2 -2
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/me.controller.d.ts +2 -2
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/mfa.controller.d.ts +2 -2
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.d.ts +2 -2
- package/dist/controllers/oauth/abstract-oauth.controller.js +3 -2
- package/dist/controllers/oauth/abstract-oauth.controller.js.map +1 -1
- package/dist/controllers/owner.controller.d.ts +1 -2
- package/dist/controllers/owner.controller.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +4 -3
- package/dist/controllers/project.controller.js +11 -3
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/controllers/tags.controller.d.ts +1 -1
- package/dist/controllers/tags.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +4 -2
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +2 -2
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-helper.ee.js +20 -4
- package/dist/environments.ee/source-control/source-control-helper.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-scoped.service.d.ts +2 -2
- package/dist/environments.ee/source-control/source-control-scoped.service.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.controller.ee.d.ts +1 -1
- package/dist/environments.ee/source-control/source-control.controller.ee.js.map +1 -1
- package/dist/environments.ee/source-control/types/requests.d.ts +1 -1
- package/dist/evaluation.ee/test-runs.types.ee.d.ts +2 -1
- package/dist/eventbus/event-bus.controller.d.ts +1 -1
- package/dist/eventbus/event-bus.controller.js.map +1 -1
- package/dist/events/events.controller.d.ts +1 -1
- package/dist/events/events.controller.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +2 -2
- package/dist/executions/execution.types.d.ts +1 -2
- package/dist/interfaces.d.ts +2 -1
- package/dist/ldap.ee/types.d.ts +1 -2
- package/dist/license/license.controller.d.ts +2 -1
- package/dist/license/license.controller.js.map +1 -1
- package/dist/license.d.ts +1 -0
- package/dist/license.js +17 -1
- package/dist/license.js.map +1 -1
- package/dist/manual-execution.service.js +1 -7
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/metrics/prometheus-metrics.service.js +3 -2
- package/dist/metrics/prometheus-metrics.service.js.map +1 -1
- package/dist/modules/external-secrets.ee/types.d.ts +1 -1
- package/dist/modules/external-secrets.ee/types.js.map +1 -1
- package/dist/modules/insights/database/entities/insights-raw.d.ts +1 -1
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +11 -10
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js +39 -32
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js.map +1 -1
- package/dist/modules/insights/insights-pruning.service.js +1 -1
- package/dist/modules/insights/insights-pruning.service.js.map +1 -1
- package/dist/modules/insights/insights.controller.d.ts +3 -1
- package/dist/modules/insights/insights.controller.js +19 -2
- package/dist/modules/insights/insights.controller.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +15 -12
- package/dist/modules/insights/insights.service.js +13 -10
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/public-api/types.d.ts +2 -2
- package/dist/public-api/v1/handlers/audit/audit.handler.d.ts +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +2 -2
- package/dist/public-api/v1/handlers/projects/projects.handler.d.ts +1 -1
- package/dist/public-api/v1/handlers/projects/projects.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/source-control/source-control.handler.d.ts +1 -1
- package/dist/public-api/v1/handlers/source-control/source-control.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/tags/tags.handler.d.ts +5 -5
- package/dist/public-api/v1/handlers/users/users.handler.ee.d.ts +1 -1
- package/dist/public-api/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/public-api/v1/handlers/variables/variables.handler.d.ts +4 -4
- package/dist/public-api/v1/handlers/workflows/workflows.handler.d.ts +8 -8
- package/dist/public-api/v1/shared/middlewares/global.middleware.d.ts +1 -1
- package/dist/public-api/v1/shared/middlewares/global.middleware.js.map +1 -1
- package/dist/push/types.d.ts +1 -2
- package/dist/requests.d.ts +1 -12
- package/dist/requests.js.map +1 -1
- package/dist/scaling/job-processor.js +16 -1
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/multi-main-setup.ee.js +1 -1
- package/dist/scaling/multi-main-setup.ee.js.map +1 -1
- package/dist/scaling/scaling.service.js +10 -6
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/scaling.types.d.ts +8 -2
- package/dist/scaling/worker-server.d.ts +1 -1
- package/dist/scaling/worker-server.js +2 -2
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/server.js +8 -7
- package/dist/server.js.map +1 -1
- package/dist/services/cache/cache.service.js +1 -1
- package/dist/services/cache/cache.service.js.map +1 -1
- package/dist/services/folder.service.d.ts +1 -0
- package/dist/services/folder.service.js +12 -0
- package/dist/services/folder.service.js.map +1 -1
- package/dist/services/frontend.service.js +2 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/hooks.service.d.ts +1 -2
- package/dist/services/hooks.service.js.map +1 -1
- package/dist/services/last-active-at.service.d.ts +12 -0
- package/dist/services/last-active-at.service.js +55 -0
- package/dist/services/last-active-at.service.js.map +1 -0
- package/dist/services/project.service.ee.d.ts +4 -1
- package/dist/services/project.service.ee.js +2 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/pruning/executions-pruning.service.d.ts +1 -2
- package/dist/services/pruning/executions-pruning.service.js +2 -3
- package/dist/services/pruning/executions-pruning.service.js.map +1 -1
- package/dist/services/public-api-key.service.d.ts +4 -3
- package/dist/services/public-api-key.service.js +6 -2
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/services/url.service.js +1 -5
- package/dist/services/url.service.js.map +1 -1
- package/dist/services/workflow-loader.service.js +1 -1
- package/dist/services/workflow-loader.service.js.map +1 -1
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.d.ts +1 -1
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.js.map +1 -1
- package/dist/sso.ee/saml/routes/saml.controller.ee.d.ts +2 -1
- package/dist/sso.ee/saml/routes/saml.controller.ee.js.map +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker-ws-server.js +5 -4
- package/dist/task-runners/task-broker/task-broker-ws-server.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker.service.js +1 -1
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/task-runners/task-runner-process-restart-loop-detector.js +1 -1
- package/dist/task-runners/task-runner-process-restart-loop-detector.js.map +1 -1
- package/dist/user-management/email/interfaces.d.ts +1 -0
- package/dist/user-management/email/templates/project-shared.handlebars +196 -0
- package/dist/user-management/email/user-management-mailer.d.ts +14 -2
- package/dist/user-management/email/user-management-mailer.js +73 -52
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/webhooks/constants.d.ts +1 -0
- package/dist/webhooks/constants.js +6 -0
- package/dist/webhooks/constants.js.map +1 -0
- package/dist/webhooks/live-webhooks.js +5 -0
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/test-webhooks.js +5 -0
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-forms.js +2 -0
- package/dist/webhooks/waiting-forms.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.js +2 -0
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +12 -4
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook-request-sanitizer.d.ts +2 -0
- package/dist/webhooks/webhook-request-sanitizer.js +33 -0
- package/dist/webhooks/webhook-request-sanitizer.js.map +1 -0
- package/dist/webhooks/webhook.types.d.ts +1 -1
- package/dist/workflow-execute-additional-data.js +3 -0
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.js +8 -0
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-history.ee/workflow-history-manager.ee.js +1 -1
- package/dist/workflows/workflow-history.ee/workflow-history-manager.ee.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +2 -1
- package/dist/workflows/workflows.controller.d.ts +1 -2
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +18 -19
- package/dist/databases/db-connection-options.d.ts +0 -21
- package/dist/databases/db-connection-options.js +0 -144
- package/dist/databases/db-connection-options.js.map +0 -1
- package/dist/databases/db-connection.d.ts +0 -23
- package/dist/databases/db-connection.js +0 -108
- package/dist/databases/db-connection.js.map +0 -1
- package/dist/utils/sql.d.ts +0 -1
- package/dist/utils/sql.js +0 -13
- package/dist/utils/sql.js.map +0 -1
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import type { UpdateApiKeyRequestDto } from '@n8n/api-types';
|
|
2
2
|
import type { CreateApiKeyRequestDto } from '@n8n/api-types/src/dto/api-keys/create-api-key-request.dto';
|
|
3
|
-
import type { User } from '@n8n/db';
|
|
3
|
+
import type { AuthenticatedRequest, User } from '@n8n/db';
|
|
4
4
|
import { ApiKey, ApiKeyRepository, UserRepository } from '@n8n/db';
|
|
5
5
|
import type { GlobalRole, ApiKeyScope } from '@n8n/permissions';
|
|
6
6
|
import type { EntityManager } from '@n8n/typeorm';
|
|
7
7
|
import type { NextFunction, Request, Response } from 'express';
|
|
8
8
|
import type { OpenAPIV3 } from 'openapi-types';
|
|
9
9
|
import { EventService } from '../events/event.service';
|
|
10
|
-
import type { AuthenticatedRequest } from '../requests';
|
|
11
10
|
import { JwtService } from './jwt.service';
|
|
11
|
+
import { LastActiveAtService } from './last-active-at.service';
|
|
12
12
|
export declare class PublicApiKeyService {
|
|
13
13
|
private readonly apiKeyRepository;
|
|
14
14
|
private readonly userRepository;
|
|
15
15
|
private readonly jwtService;
|
|
16
16
|
private readonly eventService;
|
|
17
|
-
|
|
17
|
+
private readonly lastActiveAtService;
|
|
18
|
+
constructor(apiKeyRepository: ApiKeyRepository, userRepository: UserRepository, jwtService: JwtService, eventService: EventService, lastActiveAtService: LastActiveAtService);
|
|
18
19
|
createPublicApiKeyForUser(user: User, { label, expiresAt, scopes }: CreateApiKeyRequestDto): Promise<ApiKey>;
|
|
19
20
|
getRedactedApiKeysForUser(user: User): Promise<{
|
|
20
21
|
apiKey: string;
|
|
@@ -16,17 +16,19 @@ const permissions_1 = require("@n8n/permissions");
|
|
|
16
16
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
17
17
|
const event_service_1 = require("../events/event.service");
|
|
18
18
|
const jwt_service_1 = require("./jwt.service");
|
|
19
|
+
const last_active_at_service_1 = require("./last-active-at.service");
|
|
19
20
|
const API_KEY_AUDIENCE = 'public-api';
|
|
20
21
|
const API_KEY_ISSUER = 'n8n';
|
|
21
22
|
const REDACT_API_KEY_REVEAL_COUNT = 4;
|
|
22
23
|
const REDACT_API_KEY_MAX_LENGTH = 10;
|
|
23
24
|
const PREFIX_LEGACY_API_KEY = 'n8n_api_';
|
|
24
25
|
let PublicApiKeyService = class PublicApiKeyService {
|
|
25
|
-
constructor(apiKeyRepository, userRepository, jwtService, eventService) {
|
|
26
|
+
constructor(apiKeyRepository, userRepository, jwtService, eventService, lastActiveAtService) {
|
|
26
27
|
this.apiKeyRepository = apiKeyRepository;
|
|
27
28
|
this.userRepository = userRepository;
|
|
28
29
|
this.jwtService = jwtService;
|
|
29
30
|
this.eventService = eventService;
|
|
31
|
+
this.lastActiveAtService = lastActiveAtService;
|
|
30
32
|
this.getApiKeyExpiration = (apiKey) => {
|
|
31
33
|
const decoded = this.jwtService.decode(apiKey);
|
|
32
34
|
return decoded?.exp ?? null;
|
|
@@ -95,6 +97,7 @@ let PublicApiKeyService = class PublicApiKeyService {
|
|
|
95
97
|
apiVersion: version,
|
|
96
98
|
});
|
|
97
99
|
req.user = user;
|
|
100
|
+
void this.lastActiveAtService.updateLastActiveIfStale(user.id);
|
|
98
101
|
return true;
|
|
99
102
|
};
|
|
100
103
|
}
|
|
@@ -148,6 +151,7 @@ exports.PublicApiKeyService = PublicApiKeyService = __decorate([
|
|
|
148
151
|
__metadata("design:paramtypes", [db_1.ApiKeyRepository,
|
|
149
152
|
db_1.UserRepository,
|
|
150
153
|
jwt_service_1.JwtService,
|
|
151
|
-
event_service_1.EventService
|
|
154
|
+
event_service_1.EventService,
|
|
155
|
+
last_active_at_service_1.LastActiveAtService])
|
|
152
156
|
], PublicApiKeyService);
|
|
153
157
|
//# sourceMappingURL=public-api-key.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-api-key.service.js","sourceRoot":"","sources":["../../src/services/public-api-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,gCAAmE;AACnE,gCAAkC;AAElC,kDAAoF;AAIpF,+CAAiD;AAGjD,0DAAsD;
|
|
1
|
+
{"version":3,"file":"public-api-key.service.js","sourceRoot":"","sources":["../../src/services/public-api-key.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,14 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.UrlService = void 0;
|
|
16
13
|
const config_1 = require("@n8n/config");
|
|
17
14
|
const di_1 = require("@n8n/di");
|
|
18
|
-
const config_2 = __importDefault(require("../config"));
|
|
19
15
|
let UrlService = class UrlService {
|
|
20
16
|
constructor(globalConfig) {
|
|
21
17
|
this.globalConfig = globalConfig;
|
|
@@ -29,7 +25,7 @@ let UrlService = class UrlService {
|
|
|
29
25
|
return urlBaseWebhook;
|
|
30
26
|
}
|
|
31
27
|
getInstanceBaseUrl() {
|
|
32
|
-
const n8nBaseUrl = this.trimQuotes(
|
|
28
|
+
const n8nBaseUrl = this.trimQuotes(this.globalConfig.editorBaseUrl) || this.getWebhookBaseUrl();
|
|
33
29
|
return n8nBaseUrl.endsWith('/') ? n8nBaseUrl.slice(0, n8nBaseUrl.length - 1) : n8nBaseUrl;
|
|
34
30
|
}
|
|
35
31
|
generateBaseUrl() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.service.js","sourceRoot":"","sources":["../../src/services/url.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"url.service.js","sourceRoot":"","sources":["../../src/services/url.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAG3B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAItB,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QACtD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;IACvC,CAAC;IAGD,iBAAiB;QAChB,IAAI,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC;QAC9E,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,cAAc,IAAI,GAAG,CAAC;QACvB,CAAC;QACD,OAAO,cAAc,CAAC;IACvB,CAAC;IAGD,kBAAkB;QACjB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEhG,OAAO,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAC3F,CAAC;IAEO,eAAe;QACtB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAEzD,IAAI,CAAC,QAAQ,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACpF,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,GAAG,QAAQ,MAAM,IAAI,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;IAC/C,CAAC;IAGO,UAAU,CAAC,GAAY;QAC9B,OAAO,GAAG,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;IAC/C,CAAC;CACD,CAAA;AArCY,gCAAU;qBAAV,UAAU;IADtB,IAAA,YAAO,GAAE;qCAKkC,qBAAY;GAJ3C,UAAU,CAqCtB"}
|
|
@@ -20,7 +20,7 @@ let WorkflowLoaderService = class WorkflowLoaderService {
|
|
|
20
20
|
async get(workflowId) {
|
|
21
21
|
const workflow = await this.workflowRepository.findById(workflowId);
|
|
22
22
|
if (!workflow) {
|
|
23
|
-
throw new n8n_workflow_1.
|
|
23
|
+
throw new n8n_workflow_1.UserError(`Failed to find workflow with ID "${workflowId}"`);
|
|
24
24
|
}
|
|
25
25
|
return workflow;
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-loader.service.js","sourceRoot":"","sources":["../../src/services/workflow-loader.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA6C;AAC7C,gCAAkC;AAClC,+
|
|
1
|
+
{"version":3,"file":"workflow-loader.service.js","sourceRoot":"","sources":["../../src/services/workflow-loader.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA6C;AAC7C,gCAAkC;AAClC,+CAAmF;AAG5E,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACjC,YAA6B,kBAAsC;QAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAG,CAAC;IAEvE,KAAK,CAAC,GAAG,CAAC,UAAkB;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAEpE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,wBAAS,CAAC,oCAAoC,UAAU,GAAG,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;CACD,CAAA;AAZY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,YAAO,GAAE;qCAEwC,uBAAkB;GADvD,qBAAqB,CAYjC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { OidcConfigDto } from '@n8n/api-types';
|
|
2
|
+
import { AuthenticatedRequest } from '@n8n/db';
|
|
2
3
|
import { Request, Response } from 'express';
|
|
3
4
|
import { AuthService } from '../../../auth/auth.service';
|
|
4
|
-
import { AuthenticatedRequest } from '../../../requests';
|
|
5
5
|
import { UrlService } from '../../../services/url.service';
|
|
6
6
|
import { OidcService } from '../oidc.service.ee';
|
|
7
7
|
export declare class OidcController {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso.ee/oidc/routes/oidc.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA+C;
|
|
1
|
+
{"version":3,"file":"oidc.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso.ee/oidc/routes/oidc.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA+C;AAE/C,gDAAyF;AAGzF,sDAAkD;AAClD,wDAAoD;AAEpD,4CAAiE;AACjE,wDAAiD;AAG1C,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,WAAwB,EACxB,WAAwB,EACxB,UAAsB;QAFtB,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;IACrC,CAAC;IAKE,AAAN,KAAK,CAAC,qBAAqB,CAAC,IAA0B;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QACnD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACzB,MAAM,CAAC,YAAY,GAAG,6CAAiC,CAAC;QACzD,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAKK,AAAN,KAAK,CAAC,iBAAiB,CACtB,IAA0B,EAC1B,IAAc,EACR,OAAsB;QAE5B,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC;IACf,CAAC;IAGK,AAAN,KAAK,CAAC,sBAAsB,CAAC,IAAa,EAAE,GAAa;QACxD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAEnE,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3C,CAAC;IAGK,AAAN,KAAK,CAAC,eAAe,CAAC,GAAY,EAAE,GAAa;QAChD,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5E,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAExC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;CACD,CAAA;AAjDY,wCAAc;AAUpB;IAHL,IAAA,gBAAG,EAAC,SAAS,CAAC;IACd,IAAA,qBAAQ,EAAC,WAAW,CAAC;IACrB,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;2DAO1B;AAKK;IAHL,IAAA,iBAAI,EAAC,SAAS,CAAC;IACf,IAAA,qBAAQ,EAAC,WAAW,CAAC;IACrB,IAAA,wBAAW,EAAC,aAAa,CAAC;IAIzB,WAAA,iBAAI,CAAA;;qDAAU,yBAAa;;uDAK5B;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;4DAKjC;AAGK;IADL,IAAA,gBAAG,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;qDAUpC;yBAhDW,cAAc;IAD1B,IAAA,2BAAc,EAAC,WAAW,CAAC;qCAGI,6BAAW;QACX,0BAAW;QACZ,wBAAU;GAJ5B,cAAc,CAiD1B"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { SamlAcsDto, SamlPreferences, SamlToggleDto } from '@n8n/api-types';
|
|
2
|
+
import { AuthenticatedRequest } from '@n8n/db';
|
|
2
3
|
import { Response } from 'express';
|
|
3
4
|
import { AuthService } from '../../../auth/auth.service';
|
|
4
5
|
import { EventService } from '../../../events/event.service';
|
|
5
|
-
import {
|
|
6
|
+
import { AuthlessRequest } from '../../../requests';
|
|
6
7
|
import { UrlService } from '../../../services/url.service';
|
|
7
8
|
import { SamlService } from '../saml.service.ee';
|
|
8
9
|
export declare class SamlController {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saml.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso.ee/saml/routes/saml.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,8CAA4E;
|
|
1
|
+
{"version":3,"file":"saml.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso.ee/saml/routes/saml.controller.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TaskBrokerAuthService = void 0;
|
|
13
13
|
const config_1 = require("@n8n/config");
|
|
14
|
+
const constants_1 = require("@n8n/constants");
|
|
14
15
|
const di_1 = require("@n8n/di");
|
|
15
16
|
const crypto_1 = require("crypto");
|
|
16
|
-
const constants_1 = require("../../../constants");
|
|
17
17
|
const cache_service_1 = require("../../../services/cache/cache.service");
|
|
18
18
|
const GRANT_TOKEN_TTL = 15 * constants_1.Time.seconds.toMilliseconds;
|
|
19
19
|
let TaskBrokerAuthService = class TaskBrokerAuthService {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-auth.service.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAClC,mCAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"task-broker-auth.service.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,8CAAsC;AACtC,gCAAkC;AAClC,mCAAsD;AAEtD,kEAA8D;AAE9D,MAAM,eAAe,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAGlD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGjC,YACkB,YAA0B,EAC1B,YAA0B,EAE1B,gBAAgB,eAAe;QAH/B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAE1B,kBAAa,GAAb,aAAa,CAAkB;QANhC,cAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAO/E,CAAC;IAEJ,gBAAgB,CAAC,KAAa;QAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,WAAW,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAE/D,OAAO,IAAA,wBAAe,EAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAKD,KAAK,CAAC,gBAAgB;QACrB,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE7C,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAE1D,OAAO,UAAU,CAAC;IACnB,CAAC;IAMD,KAAK,CAAC,oBAAoB,CAAC,UAAkB;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAS,GAAG,CAAC,CAAC;QAE1D,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEzC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,kBAAkB;QACzB,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAEO,qBAAqB,CAAC,UAAkB;QAC/C,OAAO,eAAe,UAAU,EAAE,CAAC;IACpC,CAAC;CACD,CAAA;AAlDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,YAAO,GAAE;qCAKuB,qBAAY;QACZ,4BAAY;GALhC,qBAAqB,CAkDjC"}
|
|
@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.TaskBrokerWsServer = void 0;
|
|
13
13
|
const backend_common_1 = require("@n8n/backend-common");
|
|
14
14
|
const config_1 = require("@n8n/config");
|
|
15
|
+
const constants_1 = require("@n8n/constants");
|
|
15
16
|
const di_1 = require("@n8n/di");
|
|
16
17
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
|
-
const
|
|
18
|
+
const constants_2 = require("../../constants");
|
|
18
19
|
const default_task_runner_disconnect_analyzer_1 = require("../../task-runners/default-task-runner-disconnect-analyzer");
|
|
19
20
|
const task_runner_lifecycle_events_1 = require("../../task-runners/task-runner-lifecycle-events");
|
|
20
21
|
const task_broker_service_1 = require("./task-broker.service");
|
|
@@ -41,7 +42,7 @@ let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
|
41
42
|
this.heartbeatTimer = setInterval(() => {
|
|
42
43
|
for (const [runnerId, connection] of this.runnerConnections.entries()) {
|
|
43
44
|
if (!connection.isAlive) {
|
|
44
|
-
void this.removeConnection(runnerId, 'failed-heartbeat-check',
|
|
45
|
+
void this.removeConnection(runnerId, 'failed-heartbeat-check', constants_2.WsStatusCodes.CloseNoStatus);
|
|
45
46
|
this.runnerLifecycleEvents.emit('runner:failed-heartbeat-check');
|
|
46
47
|
return;
|
|
47
48
|
}
|
|
@@ -108,7 +109,7 @@ let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
|
108
109
|
connection.on('message', onMessage);
|
|
109
110
|
connection.send(JSON.stringify({ type: 'broker:inforequest' }));
|
|
110
111
|
}
|
|
111
|
-
async removeConnection(id, reason = 'unknown', code =
|
|
112
|
+
async removeConnection(id, reason = 'unknown', code = constants_2.WsStatusCodes.CloseNormal) {
|
|
112
113
|
const connection = this.runnerConnections.get(id);
|
|
113
114
|
if (connection) {
|
|
114
115
|
const disconnectError = await this.disconnectAnalyzer.toDisconnectError({
|
|
@@ -126,7 +127,7 @@ let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
|
126
127
|
this.add(req.query.id, req.ws);
|
|
127
128
|
}
|
|
128
129
|
async stopConnectedRunners() {
|
|
129
|
-
await Promise.all(Array.from(this.runnerConnections.keys()).map(async (id) => await this.removeConnection(id, 'shutting-down',
|
|
130
|
+
await Promise.all(Array.from(this.runnerConnections.keys()).map(async (id) => await this.removeConnection(id, 'shutting-down', constants_2.WsStatusCodes.CloseGoingAway)));
|
|
130
131
|
}
|
|
131
132
|
};
|
|
132
133
|
exports.TaskBrokerWsServer = TaskBrokerWsServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-ws-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-ws-server.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gCAAkC;AAElC,+CAAwD;AAGxD,
|
|
1
|
+
{"version":3,"file":"task-broker-ws-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-ws-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.TaskBroker = void 0;
|
|
13
13
|
const backend_common_1 = require("@n8n/backend-common");
|
|
14
14
|
const config_1 = require("@n8n/config");
|
|
15
|
+
const constants_1 = require("@n8n/constants");
|
|
15
16
|
const di_1 = require("@n8n/di");
|
|
16
17
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
18
|
const nanoid_1 = require("nanoid");
|
|
18
|
-
const constants_1 = require("../../constants");
|
|
19
19
|
const task_deferred_error_1 = require("../../task-runners/task-broker/errors/task-deferred.error");
|
|
20
20
|
const task_reject_error_1 = require("../../task-runners/task-broker/errors/task-reject.error");
|
|
21
21
|
const task_runner_accept_timeout_error_1 = require("../../task-runners/task-broker/errors/task-runner-accept-timeout.error");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker.service.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-broker.service.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TaskRunnerProcessRestartLoopDetector = void 0;
|
|
4
|
-
const constants_1 = require("
|
|
4
|
+
const constants_1 = require("@n8n/constants");
|
|
5
5
|
const task_runner_restart_loop_error_1 = require("../task-runners/errors/task-runner-restart-loop-error");
|
|
6
6
|
const typed_emitter_1 = require("../typed-emitter");
|
|
7
7
|
const MAX_RESTARTS = 5;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-process-restart-loop-detector.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-restart-loop-detector.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"task-runner-process-restart-loop-detector.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-restart-loop-detector.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAEtC,yGAAkG;AAElG,mDAA+C;AAE/C,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,eAAe,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AASxD,MAAa,oCAAqC,SAAQ,4BAA0D;IAkBnH,YAA6B,iBAAoC;QAChE,KAAK,EAAE,CAAC;QADoB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAbhD,aAAQ,GAAG,YAAY,CAAC;QAMxB,mBAAc,GAAG,eAAe,CAAC;QAE1C,gBAAW,GAAG,CAAC,CAAC;QAGhB,qBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAKrC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YAEjB,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAC/B,IAAI,CAAC,IAAI,CACR,uBAAuB,EACvB,IAAI,2DAA0B,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAC9E,CAAC;YACH,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAKO,SAAS;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,GAAG,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YACvD,IAAI,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAEO,KAAK;QACZ,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACpC,CAAC;IAEO,kBAAkB;QACzB,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC;IAC1C,CAAC;IAEO,qBAAqB;QAC5B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAC3C,CAAC;CACD;AAzDD,oFAyDC"}
|
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
<!doctype html>
|
|
2
|
+
<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
|
|
3
|
+
|
|
4
|
+
<head>
|
|
5
|
+
<title></title>
|
|
6
|
+
<!--[if !mso]><!-->
|
|
7
|
+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
8
|
+
<!--<![endif]-->
|
|
9
|
+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
|
10
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
11
|
+
<style type="text/css">
|
|
12
|
+
#outlook a {
|
|
13
|
+
padding: 0;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
body {
|
|
17
|
+
margin: 0;
|
|
18
|
+
padding: 0;
|
|
19
|
+
-webkit-text-size-adjust: 100%;
|
|
20
|
+
-ms-text-size-adjust: 100%;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
table,
|
|
24
|
+
td {
|
|
25
|
+
border-collapse: collapse;
|
|
26
|
+
mso-table-lspace: 0pt;
|
|
27
|
+
mso-table-rspace: 0pt;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
img {
|
|
31
|
+
border: 0;
|
|
32
|
+
height: auto;
|
|
33
|
+
line-height: 100%;
|
|
34
|
+
outline: none;
|
|
35
|
+
text-decoration: none;
|
|
36
|
+
-ms-interpolation-mode: bicubic;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
p {
|
|
40
|
+
display: block;
|
|
41
|
+
margin: 13px 0;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
</style>
|
|
45
|
+
<!--[if mso]>
|
|
46
|
+
<noscript>
|
|
47
|
+
<xml>
|
|
48
|
+
<o:OfficeDocumentSettings>
|
|
49
|
+
<o:AllowPNG/>
|
|
50
|
+
<o:PixelsPerInch>96</o:PixelsPerInch>
|
|
51
|
+
</o:OfficeDocumentSettings>
|
|
52
|
+
</xml>
|
|
53
|
+
</noscript>
|
|
54
|
+
<![endif]-->
|
|
55
|
+
<!--[if lte mso 11]>
|
|
56
|
+
<style type="text/css">
|
|
57
|
+
.mj-outlook-group-fix { width:100% !important; }
|
|
58
|
+
</style>
|
|
59
|
+
<![endif]-->
|
|
60
|
+
<!--[if !mso]><!-->
|
|
61
|
+
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
|
|
62
|
+
<style type="text/css">
|
|
63
|
+
@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
|
|
64
|
+
|
|
65
|
+
</style>
|
|
66
|
+
<!--<![endif]-->
|
|
67
|
+
<style type="text/css">
|
|
68
|
+
@media only screen and (min-width:480px) {
|
|
69
|
+
.mj-column-per-100 {
|
|
70
|
+
width: 100% !important;
|
|
71
|
+
max-width: 100%;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
</style>
|
|
76
|
+
<style media="screen and (min-width:480px)">
|
|
77
|
+
.moz-text-html .mj-column-per-100 {
|
|
78
|
+
width: 100% !important;
|
|
79
|
+
max-width: 100%;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
</style>
|
|
83
|
+
<style type="text/css">
|
|
84
|
+
@media only screen and (max-width:479px) {
|
|
85
|
+
table.mj-full-width-mobile {
|
|
86
|
+
width: 100% !important;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
td.mj-full-width-mobile {
|
|
90
|
+
width: auto !important;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
</style>
|
|
95
|
+
</head>
|
|
96
|
+
|
|
97
|
+
<body style="word-spacing:normal;background-color:#fbfcfe;">
|
|
98
|
+
<div style="background-color:#fbfcfe;" lang="und" dir="auto">
|
|
99
|
+
<!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
|
|
100
|
+
<div style="margin:0px auto;max-width:600px;">
|
|
101
|
+
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
|
102
|
+
<tbody>
|
|
103
|
+
<tr>
|
|
104
|
+
<td style="direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
|
|
105
|
+
<!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
|
|
106
|
+
<div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
|
107
|
+
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
|
|
108
|
+
<tbody>
|
|
109
|
+
<tr>
|
|
110
|
+
<td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
|
|
111
|
+
<div style="font-family:Open Sans, sans-serif;font-size:24px;font-weight:400;line-height:24px;text-align:center;color:#ff6f5c;">You have been added as a {{ role }} to the {{ projectName }} project</div>
|
|
112
|
+
</td>
|
|
113
|
+
</tr>
|
|
114
|
+
</tbody>
|
|
115
|
+
</table>
|
|
116
|
+
</div>
|
|
117
|
+
<!--[if mso | IE]></td></tr></table><![endif]-->
|
|
118
|
+
</td>
|
|
119
|
+
</tr>
|
|
120
|
+
</tbody>
|
|
121
|
+
</table>
|
|
122
|
+
</div>
|
|
123
|
+
<!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#FFFFFF" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
|
|
124
|
+
<div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
|
|
125
|
+
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
|
|
126
|
+
<tbody>
|
|
127
|
+
<tr>
|
|
128
|
+
<td style="border:1px solid #ddd;direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
|
|
129
|
+
<!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
|
|
130
|
+
<div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
|
131
|
+
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
|
|
132
|
+
<tbody>
|
|
133
|
+
<tr>
|
|
134
|
+
<td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
|
|
135
|
+
<div style="font-family:Open Sans, sans-serif;font-size:16px;font-weight:400;line-height:24px;text-align:center;color:#444444;">This gives you access to all the workflows and credentials in that project</div>
|
|
136
|
+
</td>
|
|
137
|
+
</tr>
|
|
138
|
+
<tr>
|
|
139
|
+
<td align="center" style="font-size:0px;padding:10px 25px;padding-top:20px;word-break:break-word;">
|
|
140
|
+
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
|
|
141
|
+
<tbody>
|
|
142
|
+
<tr>
|
|
143
|
+
<td align="center" bgcolor="#ff6f5c" role="presentation" style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#ff6f5c;" valign="middle">
|
|
144
|
+
<a href="{{projectUrl}}" style="display:inline-block;background:#ff6f5c;color:#ffffff;font-family:Open Sans, sans-serif;font-size:18px;font-weight:600;line-height:24px;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:4px;" target="_blank"> View project </a>
|
|
145
|
+
</td>
|
|
146
|
+
</tr>
|
|
147
|
+
</tbody>
|
|
148
|
+
</table>
|
|
149
|
+
</td>
|
|
150
|
+
</tr>
|
|
151
|
+
</tbody>
|
|
152
|
+
</table>
|
|
153
|
+
</div>
|
|
154
|
+
<!--[if mso | IE]></td></tr></table><![endif]-->
|
|
155
|
+
</td>
|
|
156
|
+
</tr>
|
|
157
|
+
</tbody>
|
|
158
|
+
</table>
|
|
159
|
+
</div>
|
|
160
|
+
<!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
|
|
161
|
+
<div style="margin:0px auto;max-width:600px;">
|
|
162
|
+
<table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
|
|
163
|
+
<tbody>
|
|
164
|
+
<tr>
|
|
165
|
+
<td style="direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
|
|
166
|
+
<!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
|
|
167
|
+
<div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
|
|
168
|
+
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
|
|
169
|
+
<tbody>
|
|
170
|
+
<tr>
|
|
171
|
+
<td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
|
|
172
|
+
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
|
|
173
|
+
<tbody>
|
|
174
|
+
<tr>
|
|
175
|
+
<td style="width:70px;">
|
|
176
|
+
<img alt="" src="cid:n8n-logo" style="border:0;display:block;outline:none;text-decoration:none;height:40px;width:100%;font-size:13px;" width="70" height="40" />
|
|
177
|
+
</td>
|
|
178
|
+
</tr>
|
|
179
|
+
</tbody>
|
|
180
|
+
</table>
|
|
181
|
+
</td>
|
|
182
|
+
</tr>
|
|
183
|
+
</tbody>
|
|
184
|
+
</table>
|
|
185
|
+
</div>
|
|
186
|
+
<!--[if mso | IE]></td></tr></table><![endif]-->
|
|
187
|
+
</td>
|
|
188
|
+
</tr>
|
|
189
|
+
</tbody>
|
|
190
|
+
</table>
|
|
191
|
+
</div>
|
|
192
|
+
<!--[if mso | IE]></td></tr></table><![endif]-->
|
|
193
|
+
</div>
|
|
194
|
+
</body>
|
|
195
|
+
|
|
196
|
+
</html>
|