n8n 0.200.1 → 0.201.0
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/src/credentials/credentials.service.d.ts +2 -0
- package/dist/src/credentials/credentials.service.ee.js.map +1 -1
- package/dist/src/credentials/credentials.service.js +3 -0
- package/dist/src/credentials/credentials.service.js.map +1 -1
- package/dist/src/databases/entities/WorkflowEntity.d.ts +2 -0
- package/dist/src/databases/entities/WorkflowEntity.js +26 -0
- package/dist/src/databases/entities/WorkflowEntity.js.map +1 -1
- package/dist/src/utils.d.ts +1 -0
- package/dist/src/utils.js +8 -1
- package/dist/src/utils.js.map +1 -1
- package/dist/src/workflows/workflows.controller.ee.js +3 -2
- package/dist/src/workflows/workflows.controller.ee.js.map +1 -1
- package/dist/src/workflows/workflows.services.d.ts +1 -1
- package/dist/src/workflows/workflows.services.ee.d.ts +4 -3
- package/dist/src/workflows/workflows.services.ee.js +38 -3
- package/dist/src/workflows/workflows.services.ee.js.map +1 -1
- package/dist/src/workflows/workflows.services.js +6 -2
- package/dist/src/workflows/workflows.services.js.map +1 -1
- package/dist/src/workflows/workflows.types.d.ts +9 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Credentials } from 'n8n-core';
|
|
2
2
|
import { ICredentialDataDecryptedObject, ICredentialsDecrypted, INodeCredentialTestResult } from 'n8n-workflow';
|
|
3
|
+
import { FindManyOptions } from 'typeorm';
|
|
3
4
|
import { ICredentialsDb } from '..';
|
|
4
5
|
import { CredentialsEntity } from '../databases/entities/CredentialsEntity';
|
|
5
6
|
import { SharedCredentials } from '../databases/entities/SharedCredentials';
|
|
@@ -12,6 +13,7 @@ export declare class CredentialsService {
|
|
|
12
13
|
static getAll(user: User, options?: {
|
|
13
14
|
relations: string[];
|
|
14
15
|
}): Promise<ICredentialsDb[]>;
|
|
16
|
+
static getMany(filter: FindManyOptions<ICredentialsDb>): Promise<ICredentialsDb[]>;
|
|
15
17
|
static getSharing(user: User, credentialId: number | string, relations?: string[] | undefined, { allowGlobalOwner }?: {
|
|
16
18
|
allowGlobalOwner: boolean;
|
|
17
19
|
}): Promise<SharedCredentials | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.service.ee.js","sourceRoot":"","sources":["../../../src/credentials/credentials.service.ee.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"credentials.service.ee.js","sourceRoot":"","sources":["../../../src/credentials/credentials.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,9 @@ class CredentialsService {
|
|
|
44
44
|
},
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
|
+
static async getMany(filter) {
|
|
48
|
+
return __1.Db.collections.Credentials.find(filter);
|
|
49
|
+
}
|
|
47
50
|
static async getSharing(user, credentialId, relations = ['credentials'], { allowGlobalOwner } = { allowGlobalOwner: true }) {
|
|
48
51
|
const options = {
|
|
49
52
|
where: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../../src/credentials/credentials.service.ts"],"names":[],"mappings":";;;AAEA,uCAAqD;AACrD,+CAKsB;AACtB,
|
|
1
|
+
{"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../../src/credentials/credentials.service.ts"],"names":[],"mappings":";;;AAEA,uCAAqD;AACrD,+CAKsB;AACtB,qCAA8D;AAE9D,0BAMY;AACZ,4CAAuD;AACvD,+EAA4E;AAC5E,+EAA4E;AAC5E,sDAAmD;AACnD,sCAA0C;AAK1C,MAAa,kBAAkB;IAC9B,MAAM,CAAC,KAAK,CAAC,GAAG,CACf,UAAmC,EACnC,OAAiC;QAEjC,OAAO,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE;YACrD,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;SAC7B,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAU,EAAE,OAAiC;QAChE,MAAM,aAAa,GAAgC;YAClD,IAAI;YACJ,MAAM;YACN,MAAM;YACN,aAAa;YACb,WAAW;YACX,WAAW;SACX,CAAC;QAIF,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;YACrC,OAAO,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC;gBACtC,MAAM,EAAE,aAAa;gBACrB,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;aAC7B,CAAC,CAAC;SACH;QAID,MAAM,YAAY,GAAG,MAAM,MAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAChE,KAAK,EAAE;gBACN,IAAI;aACJ;SACD,CAAC,CAAC;QAEH,OAAO,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC;YACtC,MAAM,EAAE,aAAa;YACrB,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;YAC7B,KAAK,EAAE;gBACN,EAAE,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;aAC/C;SACD,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAuC;QAC3D,OAAO,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,UAAU,CACtB,IAAU,EACV,YAA6B,EAC7B,YAAkC,CAAC,aAAa,CAAC,EACjD,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE;QAEjD,MAAM,OAAO,GAAmB;YAC/B,KAAK,EAAE;gBACN,WAAW,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE;aACjC;SACD,CAAC;QAKF,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;YAE1D,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;SACrC;QAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACtB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;SAC9B;QAED,OAAO,MAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,sCAAsC,CAC5C,UAA6B,EAC7B,OAAO,GAAG,KAAK;QAEf,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QACzD,IAAI,OAAO,EAAE;YACZ,OAAO,IAAI,sBAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;SAC9D;QACD,OAAO,IAAI,sBAAW,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC7B,IAA4C;QAG5C,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;QAI7B,MAAM,cAAc,GAAG,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CACvD,IAAsB,CACD,CAAC;QAEvB,MAAM,IAAA,+BAAc,EAAC,cAAc,CAAC,CAAC;QAGrC,KAAK,MAAM,UAAU,IAAI,cAAc,CAAC,WAAW,EAAE;YACpD,UAAU,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;SAC7B;QAED,OAAO,cAAc,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC7B,IAA4C,EAC5C,aAA6C;QAI7C,MAAM,UAAU,GAAG,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CACnD,IAAsB,CACD,CAAC;QAEvB,MAAM,IAAA,+BAAc,EAAC,UAAU,CAAC,CAAC;QAGjC,KAAK,MAAM,UAAU,IAAI,UAAU,CAAC,WAAW,EAAE;YAChD,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;gBACrB,UAAU,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;aAC7B;SACD;QAID,IAAI,aAAa,CAAC,cAAc,EAAE;YAEjC,UAAU,CAAC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC;SAC9D;QACD,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,mBAAmB,CACzB,aAAqB,EACrB,aAA4B,EAC5B,IAAuB;QAEvB,MAAM,WAAW,GAAG,IAAI,sBAAW,CAClC,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EACtC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CAChB,CAAC;QAEF,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAiD,EAAE,aAAa,CAAC,CAAC;QAE3F,MAAM,iBAAiB,GAAG,WAAW,CAAC,aAAa,EAAoB,CAAC;QAGxE,iBAAiB,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAEzC,OAAO,iBAAiB,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB;QAC5B,IAAI;YACH,OAAO,MAAM,uBAAY,CAAC,gBAAgB,EAAE,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACf,MAAM,IAAI,kBAAc,CAAC,aAAa,CACrC,mCAAuB,CAAC,iBAAiB,EACzC,SAAS,EACT,GAAG,CACH,CAAC;SACF;IACF,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CACnB,aAAqB,EACrB,UAA6B;QAE7B,MAAM,cAAc,GAAG,IAAA,0CAAsC,EAAC,UAAU,CAAC,CAAC;QAC1E,OAAO,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAClB,YAAoB,EACpB,iBAAiC;QAEjC,MAAM,sBAAa,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAGnE,MAAM,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;QAIzE,OAAO,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAChB,UAA6B,EAC7B,aAA6B,EAC7B,IAAU;QAGV,MAAM,aAAa,GAAG,IAAI,qCAAiB,EAAE,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAExD,MAAM,sBAAa,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,MAAM,MAAE,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;YACpD,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,YAAY;SACnB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,MAAE,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;YAChE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAoB,aAAa,CAAC,CAAC;YAExF,eAAe,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YAE1C,MAAM,mBAAmB,GAAG,IAAI,qCAAiB,EAAE,CAAC;YAEpD,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;gBAClC,IAAI;gBACJ,IAAI;gBACJ,WAAW,EAAE,eAAe;aAC5B,CAAC,CAAC;YAEH,MAAM,kBAAkB,CAAC,IAAI,CAAoB,mBAAmB,CAAC,CAAC;YAEtE,OAAO,eAAe,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,0BAAW,CAAC,OAAO,CAAC,wBAAwB,EAAE;YAC7C,YAAY,EAAE,aAAa,CAAC,EAAE;YAC9B,OAAO,EAAE,IAAI,CAAC,EAAE;SAChB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAA8B;QACjD,MAAM,sBAAa,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QAEhE,MAAM,MAAE,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAChB,IAAU,EACV,aAAqB,EACrB,WAAkC,EAClC,cAAkC;QAElC,MAAM,MAAM,GAAG,IAAI,qBAAiB,CAAC,aAAa,CAAC,CAAC;QAEpD,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IACpF,CAAC;CACD;AA5PD,gDA4PC"}
|
|
@@ -14,6 +14,8 @@ export declare class WorkflowEntity extends AbstractEntity implements IWorkflowD
|
|
|
14
14
|
tags?: TagEntity[];
|
|
15
15
|
shared: SharedWorkflow[];
|
|
16
16
|
pinData: ISimplifiedPinData;
|
|
17
|
+
hash: string;
|
|
18
|
+
setHash(): void;
|
|
17
19
|
}
|
|
18
20
|
export interface ISimplifiedPinData {
|
|
19
21
|
[nodeName: string]: Array<{
|
|
@@ -31,8 +31,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
31
31
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
32
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
33
|
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
34
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
38
|
exports.WorkflowEntity = void 0;
|
|
39
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
36
40
|
const class_validator_1 = require("class-validator");
|
|
37
41
|
const typeorm_1 = require("typeorm");
|
|
38
42
|
const config = __importStar(require("../../../config"));
|
|
@@ -40,7 +44,21 @@ const TagEntity_1 = require("./TagEntity");
|
|
|
40
44
|
const SharedWorkflow_1 = require("./SharedWorkflow");
|
|
41
45
|
const transformers_1 = require("../utils/transformers");
|
|
42
46
|
const AbstractEntity_1 = require("./AbstractEntity");
|
|
47
|
+
const utils_1 = require("../../utils");
|
|
43
48
|
let WorkflowEntity = class WorkflowEntity extends AbstractEntity_1.AbstractEntity {
|
|
49
|
+
setHash() {
|
|
50
|
+
const { name, active, nodes, connections, settings, staticData, pinData } = this;
|
|
51
|
+
const state = JSON.stringify({
|
|
52
|
+
name,
|
|
53
|
+
active,
|
|
54
|
+
nodes: nodes ? nodes.map(utils_1.alphabetizeKeys) : [],
|
|
55
|
+
connections,
|
|
56
|
+
settings,
|
|
57
|
+
staticData,
|
|
58
|
+
pinData,
|
|
59
|
+
});
|
|
60
|
+
this.hash = crypto_1.default.createHash('md5').update(state).digest('hex');
|
|
61
|
+
}
|
|
44
62
|
};
|
|
45
63
|
__decorate([
|
|
46
64
|
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
@@ -108,6 +126,14 @@ __decorate([
|
|
|
108
126
|
}),
|
|
109
127
|
__metadata("design:type", Object)
|
|
110
128
|
], WorkflowEntity.prototype, "pinData", void 0);
|
|
129
|
+
__decorate([
|
|
130
|
+
(0, typeorm_1.AfterLoad)(),
|
|
131
|
+
(0, typeorm_1.AfterUpdate)(),
|
|
132
|
+
(0, typeorm_1.AfterInsert)(),
|
|
133
|
+
__metadata("design:type", Function),
|
|
134
|
+
__metadata("design:paramtypes", []),
|
|
135
|
+
__metadata("design:returntype", void 0)
|
|
136
|
+
], WorkflowEntity.prototype, "setHash", null);
|
|
111
137
|
WorkflowEntity = __decorate([
|
|
112
138
|
(0, typeorm_1.Entity)()
|
|
113
139
|
], WorkflowEntity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkflowEntity.js","sourceRoot":"","sources":["../../../../src/databases/entities/WorkflowEntity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WorkflowEntity.js","sourceRoot":"","sources":["../../../../src/databases/entities/WorkflowEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,qDAAyC;AAWzC,qCAWiB;AAEjB,wDAA0C;AAC1C,2CAAwC;AACxC,qDAAkD;AAClD,wDAAgE;AAChE,qDAAkE;AAElE,uCAA8C;AAGvC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,+BAAc;IAkEjD,OAAO;QACN,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAEjF,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;YAC5B,IAAI;YACJ,MAAM;YACN,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAe,CAAC,CAAC,CAAC,CAAC,EAAE;YAC9C,WAAW;YACX,QAAQ;YACR,UAAU;YACV,OAAO;SACP,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClE,CAAC;CACD,CAAA;AAhFA;IAAC,IAAA,gCAAsB,GAAE;;0CACd;AAGX;IAAC,IAAA,eAAK,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACvB,IAAA,wBAAM,EAAC,CAAC,EAAE,GAAG,EAAE;QACf,OAAO,EAAE,qEAAqE;KAC9E,CAAC;IACD,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;4CACX;AAEb;IAAC,IAAA,gBAAM,GAAE;;8CACO;AAEhB;IAAC,IAAA,gBAAM,EAAC,+BAAc,CAAC;;6CACR;AAEf;IAAC,IAAA,gBAAM,EAAC,+BAAc,CAAC;;mDACG;AAE1B;IAAC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,+BAAc;QACpB,QAAQ,EAAE,IAAI;KACd,CAAC;;gDAC2B;AAE7B;IAAC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,+BAAc;QACpB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,8BAAe;KAC5B,CAAC;;kDACuB;AAEzB;IAAC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,qBAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;IACnD,IAAA,mBAAS,EAAC;QACV,IAAI,EAAE,gBAAgB;QACtB,UAAU,EAAE;YACX,IAAI,EAAE,YAAY;YAClB,oBAAoB,EAAE,IAAI;SAC1B;QACD,iBAAiB,EAAE;YAClB,IAAI,EAAE,OAAO;YACb,oBAAoB,EAAE,IAAI;SAC1B;KACD,CAAC;;4CACiB;AAEnB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,+BAAc,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC;;8CACpD;AAEzB;IAAC,IAAA,gBAAM,EAAC;QACP,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;QACnE,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,qBAAM,CAAC,UAAU;KAC9B,CAAC;;+CAC0B;AAO5B;IAAC,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;6CAeb;AAhFW,cAAc;IAD1B,IAAA,gBAAM,GAAE;GACI,cAAc,CAiF1B;AAjFY,wCAAc"}
|
package/dist/src/utils.d.ts
CHANGED
package/dist/src/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.findCliWorkflowStart = exports.findSubworkflowStart = void 0;
|
|
3
|
+
exports.alphabetizeKeys = exports.findCliWorkflowStart = exports.findSubworkflowStart = void 0;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
function findWorkflowStart(executionMode) {
|
|
6
6
|
return function (nodes) {
|
|
@@ -20,4 +20,11 @@ function findWorkflowStart(executionMode) {
|
|
|
20
20
|
}
|
|
21
21
|
exports.findSubworkflowStart = findWorkflowStart('integrated');
|
|
22
22
|
exports.findCliWorkflowStart = findWorkflowStart('cli');
|
|
23
|
+
const alphabetizeKeys = (obj) => Object.keys(obj)
|
|
24
|
+
.sort()
|
|
25
|
+
.reduce((acc, key) => ({
|
|
26
|
+
...acc,
|
|
27
|
+
[key]: obj[key],
|
|
28
|
+
}), {});
|
|
29
|
+
exports.alphabetizeKeys = alphabetizeKeys;
|
|
23
30
|
//# sourceMappingURL=utils.js.map
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AACA,+CAAoF;AAGpF,SAAS,iBAAiB,CAAC,aAAmC;IAC7D,OAAO,UAAU,KAAc;QAC9B,MAAM,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAC5C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,uCAAuC,CAC/D,CAAC;QAEF,IAAI,0BAA0B;YAAE,OAAO,0BAA0B,CAAC;QAElE,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;QAE7E,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC;QAEhC,MAAM,KAAK,GAAG,iCAAiC,CAAC;QAChD,MAAM,WAAW,GAChB,wFAAwF,CAAC;QAE1F,IAAI,aAAa,KAAK,YAAY,EAAE;YACnC,MAAM,IAAI,wCAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;SACxD;QAED,MAAM,IAAI,wCAAyB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACzD,CAAC,CAAC;AACH,CAAC;AAEY,QAAA,oBAAoB,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;AAEvD,QAAA,oBAAoB,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAEtD,MAAM,eAAe,GAAG,CAAC,GAAU,EAAE,EAAE,CAC7C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;KACd,IAAI,EAAE;KACN,MAAM,CACN,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACd,GAAG,GAAG;IAEN,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;CACf,CAAC,EACF,EAAE,CACF,CAAC;AAVS,QAAA,eAAe,mBAUxB"}
|
|
@@ -79,7 +79,7 @@ exports.EEWorkflowController.get('/:id(\\d+)', __1.ResponseHelper.send(async (re
|
|
|
79
79
|
if (!userSharing && req.user.globalRole.name !== 'owner') {
|
|
80
80
|
throw new __1.ResponseHelper.ResponseError(`Forbidden.`, undefined, 403);
|
|
81
81
|
}
|
|
82
|
-
return workflows_services_ee_1.EEWorkflowsService.addOwnerAndSharings(workflow);
|
|
82
|
+
return workflows_services_ee_1.EEWorkflowsService.addCredentialsToWorkflow(workflows_services_ee_1.EEWorkflowsService.addOwnerAndSharings(workflow), req.user);
|
|
83
83
|
}));
|
|
84
84
|
exports.EEWorkflowController.post('/', __1.ResponseHelper.send(async (req) => {
|
|
85
85
|
delete req.body.id;
|
|
@@ -136,10 +136,11 @@ exports.EEWorkflowController.post('/', __1.ResponseHelper.send(async (req) => {
|
|
|
136
136
|
}));
|
|
137
137
|
exports.EEWorkflowController.patch('/:id(\\d+)', __1.ResponseHelper.send(async (req) => {
|
|
138
138
|
const { id: workflowId } = req.params;
|
|
139
|
+
const forceSave = req.query.forceSave === 'true';
|
|
139
140
|
const updateData = new WorkflowEntity_1.WorkflowEntity();
|
|
140
141
|
const { tags, ...rest } = req.body;
|
|
141
142
|
Object.assign(updateData, rest);
|
|
142
|
-
const updatedWorkflow = await workflows_services_ee_1.EEWorkflowsService.updateWorkflow(req.user, updateData, workflowId, tags);
|
|
143
|
+
const updatedWorkflow = await workflows_services_ee_1.EEWorkflowsService.updateWorkflow(req.user, updateData, workflowId, tags, forceSave);
|
|
143
144
|
const { id, ...remainder } = updatedWorkflow;
|
|
144
145
|
return {
|
|
145
146
|
id: id.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.controller.ee.js","sourceRoot":"","sources":["../../../src/workflows/workflows.controller.ee.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workflows.controller.ee.js","sourceRoot":"","sources":["../../../src/workflows/workflows.controller.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ export declare class WorkflowsService {
|
|
|
8
8
|
static get(workflow: Partial<WorkflowEntity>, options?: {
|
|
9
9
|
relations: string[];
|
|
10
10
|
}): Promise<WorkflowEntity | undefined>;
|
|
11
|
-
static updateWorkflow(user: User, workflow: WorkflowEntity, workflowId: string, tags?: string[]): Promise<WorkflowEntity>;
|
|
11
|
+
static updateWorkflow(user: User, workflow: WorkflowEntity, workflowId: string, tags?: string[], forceSave?: boolean): Promise<WorkflowEntity>;
|
|
12
12
|
}
|
|
@@ -4,7 +4,7 @@ import { SharedWorkflow } from '../databases/entities/SharedWorkflow';
|
|
|
4
4
|
import { User } from '../databases/entities/User';
|
|
5
5
|
import { WorkflowEntity } from '../databases/entities/WorkflowEntity';
|
|
6
6
|
import { WorkflowsService } from './workflows.services';
|
|
7
|
-
import {
|
|
7
|
+
import type { WorkflowWithSharingsAndCredentials } from './workflows.types';
|
|
8
8
|
export declare class EEWorkflowsService extends WorkflowsService {
|
|
9
9
|
static isOwned(user: User, workflowId: string): Promise<{
|
|
10
10
|
ownsWorkflow: boolean;
|
|
@@ -13,7 +13,8 @@ export declare class EEWorkflowsService extends WorkflowsService {
|
|
|
13
13
|
static getSharings(transaction: EntityManager, workflowId: string): Promise<SharedWorkflow[]>;
|
|
14
14
|
static pruneSharings(transaction: EntityManager, workflowId: string, userIds: string[]): Promise<DeleteResult>;
|
|
15
15
|
static share(transaction: EntityManager, workflow: WorkflowEntity, shareWithIds: string[]): Promise<SharedWorkflow[]>;
|
|
16
|
-
static addOwnerAndSharings(workflow:
|
|
16
|
+
static addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): WorkflowWithSharingsAndCredentials;
|
|
17
|
+
static addCredentialsToWorkflow(workflow: WorkflowWithSharingsAndCredentials, currentUser: User): Promise<WorkflowWithSharingsAndCredentials>;
|
|
17
18
|
static validateCredentialPermissionsToUser(workflow: WorkflowEntity, allowedCredentials: ICredentialsDb[]): void;
|
|
18
|
-
static updateWorkflow(user: User, workflow: WorkflowEntity, workflowId: string, tags?: string[]): Promise<WorkflowEntity>;
|
|
19
|
+
static updateWorkflow(user: User, workflow: WorkflowEntity, workflowId: string, tags?: string[], forceSave?: boolean): Promise<WorkflowEntity>;
|
|
19
20
|
}
|
|
@@ -54,6 +54,7 @@ class EEWorkflowsService extends workflows_services_1.WorkflowsService {
|
|
|
54
54
|
var _a;
|
|
55
55
|
workflow.ownedBy = null;
|
|
56
56
|
workflow.sharedWith = [];
|
|
57
|
+
workflow.usedCredentials = [];
|
|
57
58
|
(_a = workflow.shared) === null || _a === void 0 ? void 0 : _a.forEach(({ user, role }) => {
|
|
58
59
|
var _a;
|
|
59
60
|
const { id, email, firstName, lastName } = user;
|
|
@@ -66,6 +67,41 @@ class EEWorkflowsService extends workflows_services_1.WorkflowsService {
|
|
|
66
67
|
delete workflow.shared;
|
|
67
68
|
return workflow;
|
|
68
69
|
}
|
|
70
|
+
static async addCredentialsToWorkflow(workflow, currentUser) {
|
|
71
|
+
workflow.usedCredentials = [];
|
|
72
|
+
const userCredentials = await credentials_service_ee_1.EECredentialsService.getAll(currentUser);
|
|
73
|
+
const credentialIdsUsedByWorkflow = new Set();
|
|
74
|
+
workflow.nodes.forEach((node) => {
|
|
75
|
+
if (!node.credentials) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
Object.keys(node.credentials).forEach((credentialType) => {
|
|
79
|
+
var _a;
|
|
80
|
+
const credential = (_a = node.credentials) === null || _a === void 0 ? void 0 : _a[credentialType];
|
|
81
|
+
if (!(credential === null || credential === void 0 ? void 0 : credential.id)) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const credentialId = parseInt(credential.id, 10);
|
|
85
|
+
credentialIdsUsedByWorkflow.add(credentialId);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
const workflowCredentials = await credentials_service_ee_1.EECredentialsService.getMany({
|
|
89
|
+
where: {
|
|
90
|
+
id: (0, typeorm_1.In)(Array.from(credentialIdsUsedByWorkflow)),
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
const userCredentialIds = userCredentials.map((credential) => credential.id.toString());
|
|
94
|
+
workflowCredentials.forEach((credential) => {
|
|
95
|
+
var _a;
|
|
96
|
+
const credentialId = credential.id.toString();
|
|
97
|
+
(_a = workflow.usedCredentials) === null || _a === void 0 ? void 0 : _a.push({
|
|
98
|
+
id: credential.id.toString(),
|
|
99
|
+
name: credential.name,
|
|
100
|
+
currentUserHasAccess: userCredentialIds.includes(credentialId),
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
return workflow;
|
|
104
|
+
}
|
|
69
105
|
static validateCredentialPermissionsToUser(workflow, allowedCredentials) {
|
|
70
106
|
workflow.nodes.forEach((node) => {
|
|
71
107
|
if (!node.credentials) {
|
|
@@ -81,7 +117,7 @@ class EEWorkflowsService extends workflows_services_1.WorkflowsService {
|
|
|
81
117
|
});
|
|
82
118
|
});
|
|
83
119
|
}
|
|
84
|
-
static async updateWorkflow(user, workflow, workflowId, tags) {
|
|
120
|
+
static async updateWorkflow(user, workflow, workflowId, tags, forceSave) {
|
|
85
121
|
const previousVersion = await EEWorkflowsService.get({ id: parseInt(workflowId, 10) });
|
|
86
122
|
if (!previousVersion) {
|
|
87
123
|
throw new __1.ResponseHelper.ResponseError('Workflow not found', undefined, 404);
|
|
@@ -91,10 +127,9 @@ class EEWorkflowsService extends workflows_services_1.WorkflowsService {
|
|
|
91
127
|
workflow = __1.WorkflowHelpers.validateWorkflowCredentialUsage(workflow, previousVersion, allCredentials);
|
|
92
128
|
}
|
|
93
129
|
catch (error) {
|
|
94
|
-
console.log(error);
|
|
95
130
|
throw new __1.ResponseHelper.ResponseError('Invalid workflow credentials - make sure you have access to all credentials and try again.', undefined, 400);
|
|
96
131
|
}
|
|
97
|
-
return super.updateWorkflow(user, workflow, workflowId, tags);
|
|
132
|
+
return super.updateWorkflow(user, workflow, workflowId, tags, forceSave);
|
|
98
133
|
}
|
|
99
134
|
}
|
|
100
135
|
exports.EEWorkflowsService = EEWorkflowsService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.services.ee.js","sourceRoot":"","sources":["../../../src/workflows/workflows.services.ee.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAC/D,0BAAyE;AACzE,yEAAsE;AAEtE,yEAAsE;AACtE,uDAAmD;AACnD,uDAAmD;AACnD,6DAAwD;AAExD,kFAA8F;AAE9F,MAAa,kBAAmB,SAAQ,qCAAgB;IACvD,MAAM,CAAC,KAAK,CAAC,OAAO,CACnB,IAAU,EACV,UAAkB;QAElB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE;YAC7E,gBAAgB,EAAE,KAAK;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;QAE9E,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAE7B,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CACvB,WAA0B,EAC1B,UAAkB;;QAElB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,+BAAc,EAAE,UAAU,EAAE;YACtE,SAAS,EAAE,CAAC,QAAQ,CAAC;SACrB,CAAC,CAAC;QACH,OAAO,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,mCAAI,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CACzB,WAA0B,EAC1B,UAAkB,EAClB,OAAiB;QAEjB,OAAO,WAAW,CAAC,MAAM,CAAC,+BAAc,EAAE;YACzC,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;YAC5B,IAAI,EAAE,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,IAAA,YAAE,EAAC,OAAO,CAAC,CAAC,EAAE;SAC9B,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAK,CACjB,WAA0B,EAC1B,QAAwB,EACxB,YAAsB;QAEtB,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvC,0BAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;YAC/C,0BAAW,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACtE,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACvE,IAAI,IAAI,CAAC,SAAS,EAAE;gBACnB,OAAO,GAAG,CAAC;aACX;YACD,GAAG,CAAC,IAAI,CACP,MAAE,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC;gBACpC,QAAQ;gBACR,IAAI;gBACJ,IAAI;aACJ,CAAC,CACF,CAAC;YACF,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,mBAAmB,CACzB,
|
|
1
|
+
{"version":3,"file":"workflows.services.ee.js","sourceRoot":"","sources":["../../../src/workflows/workflows.services.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ class WorkflowsService {
|
|
|
51
51
|
static async get(workflow, options) {
|
|
52
52
|
return __1.Db.collections.Workflow.findOne(workflow, options);
|
|
53
53
|
}
|
|
54
|
-
static async updateWorkflow(user, workflow, workflowId, tags) {
|
|
54
|
+
static async updateWorkflow(user, workflow, workflowId, tags, forceSave) {
|
|
55
55
|
var _a;
|
|
56
56
|
const shared = await __1.Db.collections.SharedWorkflow.findOne({
|
|
57
57
|
relations: ['workflow'],
|
|
@@ -68,6 +68,9 @@ class WorkflowsService {
|
|
|
68
68
|
});
|
|
69
69
|
throw new __1.ResponseHelper.ResponseError(`Workflow with ID "${workflowId}" could not be found to be updated.`, undefined, 404);
|
|
70
70
|
}
|
|
71
|
+
if (!forceSave && workflow.hash !== shared.workflow.hash) {
|
|
72
|
+
throw new __1.ResponseHelper.ResponseError(`Workflow ID ${workflowId} cannot be saved because it was changed by another user.`, undefined, 400);
|
|
73
|
+
}
|
|
71
74
|
await __1.WorkflowHelpers.replaceInvalidCredentials(workflow);
|
|
72
75
|
__1.WorkflowHelpers.addNodeIds(workflow);
|
|
73
76
|
await Server_1.externalHooks.run('workflow.update', [workflow]);
|
|
@@ -96,7 +99,8 @@ class WorkflowsService {
|
|
|
96
99
|
workflow.updatedAt = new Date();
|
|
97
100
|
await (0, GenericHelpers_1.validateEntity)(workflow);
|
|
98
101
|
}
|
|
99
|
-
|
|
102
|
+
const { hash, ...rest } = workflow;
|
|
103
|
+
await __1.Db.collections.Workflow.update(workflowId, rest);
|
|
100
104
|
if (tags && !config_1.default.getEnv('workflowTagsDisabled')) {
|
|
101
105
|
const tablePrefix = config_1.default.getEnv('database.tablePrefix');
|
|
102
106
|
await TagHelpers.removeRelations(workflowId, tablePrefix);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.services.js","sourceRoot":"","sources":["../../../src/workflows/workflows.services.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2C;AAE3C,0BAOY;AACZ,0DAAkC;AAIlC,sDAAmD;AACnD,sCAA0C;AAC1C,0DAA4C;AAE5C,MAAa,gBAAgB;IAC5B,MAAM,CAAC,KAAK,CAAC,UAAU,CACtB,IAAU,EACV,UAA2B,EAC3B,YAAsB,CAAC,UAAU,CAAC,EAClC,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE;QAEjD,MAAM,OAAO,GAA8D;YAC1E,KAAK,EAAE;gBACN,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;aAC5B;SACD,CAAC;QAKF,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1D,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;SACrC;QAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACtB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;SAC9B;QAED,OAAO,MAAE,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAiC,EAAE,OAAiC;QACpF,OAAO,MAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAC1B,IAAU,EACV,QAAwB,EACxB,UAAkB,EAClB,IAAe;;
|
|
1
|
+
{"version":3,"file":"workflows.services.js","sourceRoot":"","sources":["../../../src/workflows/workflows.services.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import type { IUser } from 'n8n-workflow';
|
|
2
|
+
import { SharedWorkflow } from '../databases/entities/SharedWorkflow';
|
|
2
3
|
import { WorkflowEntity } from '../databases/entities/WorkflowEntity';
|
|
3
|
-
export interface
|
|
4
|
+
export interface WorkflowWithSharingsAndCredentials extends Omit<WorkflowEntity, 'shared'> {
|
|
4
5
|
ownedBy?: IUser | null;
|
|
5
6
|
sharedWith?: IUser[];
|
|
7
|
+
usedCredentials?: CredentialUsedByWorkflow[];
|
|
8
|
+
shared?: SharedWorkflow[];
|
|
9
|
+
}
|
|
10
|
+
export interface CredentialUsedByWorkflow {
|
|
11
|
+
id: string;
|
|
12
|
+
name: string;
|
|
13
|
+
currentUserHasAccess: boolean;
|
|
6
14
|
}
|