auth0-deploy-cli 7.6.0 → 7.7.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/.eslintrc +7 -41
- package/.husky/pre-commit +4 -0
- package/.husky/pre-push +3 -1
- package/.prettierignore +10 -0
- package/.prettierrc.json +4 -0
- package/CHANGELOG.md +194 -7
- package/CONTRIBUTING.md +2 -2
- package/README.md +3 -0
- package/lib/args.js +16 -15
- package/lib/commands/export.js +3 -3
- package/lib/commands/import.js +6 -6
- package/lib/commands/index.js +1 -1
- package/lib/configFactory.js +5 -1
- package/lib/context/defaults.js +4 -3
- package/lib/context/directory/handlers/actions.js +3 -3
- package/lib/context/directory/handlers/attackProtection.js +4 -4
- package/lib/context/directory/handlers/branding.js +6 -5
- package/lib/context/directory/handlers/clientGrants.js +3 -2
- package/lib/context/directory/handlers/clients.js +1 -1
- package/lib/context/directory/handlers/connections.js +4 -2
- package/lib/context/directory/handlers/databases.js +13 -7
- package/lib/context/directory/handlers/emailProvider.js +3 -2
- package/lib/context/directory/handlers/emailTemplates.js +2 -2
- package/lib/context/directory/handlers/guardianFactorProviders.js +3 -2
- package/lib/context/directory/handlers/guardianFactorTemplates.js +3 -2
- package/lib/context/directory/handlers/guardianFactors.js +3 -2
- package/lib/context/directory/handlers/guardianPhoneFactorMessageTypes.js +1 -1
- package/lib/context/directory/handlers/guardianPhoneFactorSelectedProvider.js +1 -1
- package/lib/context/directory/handlers/guardianPolicies.js +1 -1
- package/lib/context/directory/handlers/hooks.js +2 -2
- package/lib/context/directory/handlers/index.js +3 -2
- package/lib/context/directory/handlers/organizations.js +1 -1
- package/lib/context/directory/handlers/pages.js +2 -2
- package/lib/context/directory/handlers/resourceServers.js +3 -2
- package/lib/context/directory/handlers/roles.js +1 -1
- package/lib/context/directory/handlers/rules.js +2 -2
- package/lib/context/directory/handlers/rulesConfigs.js +3 -2
- package/lib/context/directory/handlers/tenant.js +3 -2
- package/lib/context/directory/index.js +21 -18
- package/lib/context/index.js +66 -62
- package/lib/context/yaml/handlers/actions.js +9 -6
- package/lib/context/yaml/handlers/attackProtection.js +1 -1
- package/lib/context/yaml/handlers/branding.js +5 -4
- package/lib/context/yaml/handlers/clientGrants.js +2 -2
- package/lib/context/yaml/handlers/clients.js +6 -4
- package/lib/context/yaml/handlers/connections.js +7 -5
- package/lib/context/yaml/handlers/databases.js +12 -8
- package/lib/context/yaml/handlers/emailProvider.js +4 -3
- package/lib/context/yaml/handlers/emailTemplates.js +3 -3
- package/lib/context/yaml/handlers/guardianFactorProviders.js +1 -1
- package/lib/context/yaml/handlers/guardianFactorTemplates.js +1 -1
- package/lib/context/yaml/handlers/guardianFactors.js +1 -1
- package/lib/context/yaml/handlers/guardianPhoneFactorMessageTypes.js +1 -1
- package/lib/context/yaml/handlers/guardianPhoneFactorSelectedProvider.js +1 -1
- package/lib/context/yaml/handlers/guardianPolicies.js +1 -1
- package/lib/context/yaml/handlers/hooks.js +4 -3
- package/lib/context/yaml/handlers/index.js +3 -2
- package/lib/context/yaml/handlers/organizations.js +3 -3
- package/lib/context/yaml/handlers/pages.js +3 -3
- package/lib/context/yaml/handlers/resourceServers.js +2 -2
- package/lib/context/yaml/handlers/roles.js +3 -3
- package/lib/context/yaml/handlers/rules.js +3 -3
- package/lib/context/yaml/handlers/rulesConfigs.js +2 -2
- package/lib/context/yaml/handlers/tenant.js +4 -3
- package/lib/context/yaml/handlers/triggers.js +2 -2
- package/lib/context/yaml/index.js +31 -23
- package/lib/index.js +20 -15
- package/lib/logger.js +4 -3
- package/lib/readonly.js +11 -16
- package/lib/sessionDurationsToMinutes.js +15 -0
- package/lib/tools/auth0/client.js +6 -6
- package/lib/tools/auth0/handlers/actions.js +21 -23
- package/lib/tools/auth0/handlers/attackProtection.js +14 -17
- package/lib/tools/auth0/handlers/branding.js +13 -9
- package/lib/tools/auth0/handlers/clientGrants.js +17 -10
- package/lib/tools/auth0/handlers/clients.js +15 -8
- package/lib/tools/auth0/handlers/connections.js +30 -10
- package/lib/tools/auth0/handlers/databases.js +24 -12
- package/lib/tools/auth0/handlers/default.js +41 -29
- package/lib/tools/auth0/handlers/emailTemplates.js +8 -10
- package/lib/tools/auth0/handlers/guardianFactorProviders.js +3 -3
- package/lib/tools/auth0/handlers/guardianFactorTemplates.js +3 -3
- package/lib/tools/auth0/handlers/guardianFactors.js +3 -3
- package/lib/tools/auth0/handlers/guardianPhoneFactorMessageTypes.js +11 -10
- package/lib/tools/auth0/handlers/guardianPhoneFactorSelectedProvider.js +10 -9
- package/lib/tools/auth0/handlers/guardianPolicies.js +5 -4
- package/lib/tools/auth0/handlers/hooks.js +34 -21
- package/lib/tools/auth0/handlers/index.js +31 -27
- package/lib/tools/auth0/handlers/migrations.js +2 -1
- package/lib/tools/auth0/handlers/organizations.js +61 -31
- package/lib/tools/auth0/handlers/pages.js +20 -14
- package/lib/tools/auth0/handlers/prompts.js +1 -0
- package/lib/tools/auth0/handlers/resourceServers.js +22 -14
- package/lib/tools/auth0/handlers/roles.js +55 -31
- package/lib/tools/auth0/handlers/rules.js +49 -32
- package/lib/tools/auth0/handlers/rulesConfigs.js +12 -6
- package/lib/tools/auth0/handlers/tenant.js +8 -4
- package/lib/tools/auth0/handlers/triggers.js +11 -12
- package/lib/tools/auth0/index.js +15 -31
- package/lib/tools/auth0/schema.js +7 -27
- package/lib/tools/calculateChanges.js +11 -6
- package/lib/tools/constants.js +162 -161
- package/lib/tools/deploy.js +1 -1
- package/lib/tools/index.js +1 -1
- package/lib/tools/logger.js +14 -8
- package/lib/tools/utils.js +2 -2
- package/lib/tools/{ValidationError.js → validationError.js} +3 -1
- package/lib/types.js +2 -0
- package/lib/utils.js +12 -22
- package/package.json +8 -1
- package/tsconfig.json +1 -3
- package/typescript-migration-progress.sh +1 -1
|
@@ -22,16 +22,17 @@ exports.schema = {
|
|
|
22
22
|
type: 'array',
|
|
23
23
|
items: {
|
|
24
24
|
type: 'string',
|
|
25
|
-
enum: constants_1.default.GUARDIAN_POLICIES
|
|
26
|
-
}
|
|
27
|
-
}
|
|
25
|
+
enum: constants_1.default.GUARDIAN_POLICIES,
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
28
|
},
|
|
29
|
-
additionalProperties: false
|
|
29
|
+
additionalProperties: false,
|
|
30
30
|
};
|
|
31
31
|
class GuardianPoliciesHandler extends default_1.default {
|
|
32
32
|
constructor(options) {
|
|
33
33
|
super(Object.assign(Object.assign({}, options), { type: 'guardianPolicies' }));
|
|
34
34
|
}
|
|
35
|
+
//TODO: standardize empty object literal with more intentional empty indicator
|
|
35
36
|
getType() {
|
|
36
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
37
38
|
// in case client version does not support the operation
|
|
@@ -15,10 +15,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.schema = exports.excludeSchema = void 0;
|
|
16
16
|
const default_1 = __importDefault(require("./default"));
|
|
17
17
|
const constants_1 = __importDefault(require("../../constants"));
|
|
18
|
-
const ALLOWED_TRIGGER_IDS = [
|
|
18
|
+
const ALLOWED_TRIGGER_IDS = [
|
|
19
|
+
'credentials-exchange',
|
|
20
|
+
'pre-user-registration',
|
|
21
|
+
'post-user-registration',
|
|
22
|
+
'post-change-password',
|
|
23
|
+
'send-phone-message',
|
|
24
|
+
];
|
|
19
25
|
exports.excludeSchema = {
|
|
20
26
|
type: 'array',
|
|
21
|
-
items: { type: 'string' }
|
|
27
|
+
items: { type: 'string' },
|
|
22
28
|
};
|
|
23
29
|
exports.schema = {
|
|
24
30
|
type: 'array',
|
|
@@ -28,37 +34,37 @@ exports.schema = {
|
|
|
28
34
|
properties: {
|
|
29
35
|
script: {
|
|
30
36
|
type: 'string',
|
|
31
|
-
description:
|
|
32
|
-
default: ''
|
|
37
|
+
description: "A script that contains the hook's code",
|
|
38
|
+
default: '',
|
|
33
39
|
},
|
|
34
40
|
name: {
|
|
35
41
|
type: 'string',
|
|
36
|
-
description:
|
|
37
|
-
pattern: '^[^-\\s][a-zA-Z0-9-\\s]+[^-\\s]$'
|
|
42
|
+
description: "The name of the hook. Can only contain alphanumeric characters, spaces and '-'. Can neither start nor end with '-' or spaces",
|
|
43
|
+
pattern: '^[^-\\s][a-zA-Z0-9-\\s]+[^-\\s]$',
|
|
38
44
|
},
|
|
39
45
|
enabled: {
|
|
40
46
|
type: 'boolean',
|
|
41
47
|
description: 'true if the hook is active, false otherwise',
|
|
42
|
-
default: false
|
|
48
|
+
default: false,
|
|
43
49
|
},
|
|
44
50
|
triggerId: {
|
|
45
51
|
type: 'string',
|
|
46
|
-
description:
|
|
47
|
-
enum: ALLOWED_TRIGGER_IDS
|
|
52
|
+
description: "The hooks's trigger ID",
|
|
53
|
+
enum: ALLOWED_TRIGGER_IDS,
|
|
48
54
|
},
|
|
49
55
|
secrets: {
|
|
50
56
|
type: 'object',
|
|
51
57
|
description: 'List of key-value pairs containing secrets available to the hook.',
|
|
52
|
-
default: {}
|
|
58
|
+
default: {},
|
|
53
59
|
},
|
|
54
60
|
dependencies: {
|
|
55
61
|
type: 'object',
|
|
56
62
|
default: {},
|
|
57
|
-
description: 'List of key-value pairs of NPM dependencies available to the hook.'
|
|
58
|
-
}
|
|
63
|
+
description: 'List of key-value pairs of NPM dependencies available to the hook.',
|
|
64
|
+
},
|
|
59
65
|
},
|
|
60
|
-
required: ['script', 'name', 'triggerId']
|
|
61
|
-
}
|
|
66
|
+
required: ['script', 'name', 'triggerId'],
|
|
67
|
+
},
|
|
62
68
|
};
|
|
63
69
|
const getCertainHook = (hooks, name, triggerId) => {
|
|
64
70
|
let result = null;
|
|
@@ -89,11 +95,13 @@ class HooksHandler extends default_1.default {
|
|
|
89
95
|
const changes = {
|
|
90
96
|
create: [],
|
|
91
97
|
update: [],
|
|
92
|
-
del: []
|
|
98
|
+
del: [],
|
|
99
|
+
conflicts: [],
|
|
93
100
|
};
|
|
94
101
|
hooks.forEach((hook) => {
|
|
95
102
|
const current = getCertainHook(allHooks, hook.name, hook.triggerId);
|
|
96
|
-
if (current) {
|
|
103
|
+
if (current) {
|
|
104
|
+
// if the hook was deleted we don't care about its secrets
|
|
97
105
|
const oldSecrets = current.secrets || {};
|
|
98
106
|
const newSecrets = hook.secrets || {};
|
|
99
107
|
const create = {};
|
|
@@ -131,6 +139,7 @@ class HooksHandler extends default_1.default {
|
|
|
131
139
|
})));
|
|
132
140
|
});
|
|
133
141
|
}
|
|
142
|
+
//@ts-ignore because hooks use a special reload argument
|
|
134
143
|
getType(reload) {
|
|
135
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
136
145
|
if (this.existing && !reload) {
|
|
@@ -143,8 +152,10 @@ class HooksHandler extends default_1.default {
|
|
|
143
152
|
try {
|
|
144
153
|
const hooks = yield this.client.hooks.getAll({ paginate: true, include_totals: true });
|
|
145
154
|
// hooks.getAll does not return code and secrets, we have to fetch hooks one-by-one
|
|
146
|
-
this.existing = yield Promise.all(hooks.map((hook) => this.client.hooks
|
|
147
|
-
.
|
|
155
|
+
this.existing = yield Promise.all(hooks.map((hook) => this.client.hooks
|
|
156
|
+
.get({ id: hook.id })
|
|
157
|
+
.then((hookWithCode) => this.client.hooks
|
|
158
|
+
.getSecrets({ id: hook.id })
|
|
148
159
|
.then((secrets) => (Object.assign(Object.assign({}, hookWithCode), { secrets }))))));
|
|
149
160
|
return this.existing;
|
|
150
161
|
}
|
|
@@ -168,7 +179,7 @@ class HooksHandler extends default_1.default {
|
|
|
168
179
|
del,
|
|
169
180
|
update: stripSecrets(update),
|
|
170
181
|
create: stripSecrets(create),
|
|
171
|
-
conflicts: stripSecrets(conflicts)
|
|
182
|
+
conflicts: stripSecrets(conflicts),
|
|
172
183
|
};
|
|
173
184
|
});
|
|
174
185
|
}
|
|
@@ -183,9 +194,11 @@ class HooksHandler extends default_1.default {
|
|
|
183
194
|
return;
|
|
184
195
|
const activeHooks = getActive(hooks);
|
|
185
196
|
ALLOWED_TRIGGER_IDS.forEach((type) => {
|
|
186
|
-
if (activeHooks[type].length > 1) {
|
|
197
|
+
if (activeHooks[type].length > 1) {
|
|
198
|
+
// There can be only one!
|
|
187
199
|
const conflict = activeHooks[type].map((h) => h.name).join(', ');
|
|
188
200
|
const err = new Error(`Only one active hook allowed for "${type}" extensibility point. Conflicting hooks: ${conflict}`);
|
|
201
|
+
//@ts-ignore need to investigate if appending status actually works here
|
|
189
202
|
err.status = 409;
|
|
190
203
|
throw err;
|
|
191
204
|
}
|
|
@@ -208,7 +221,7 @@ class HooksHandler extends default_1.default {
|
|
|
208
221
|
del: changes.del,
|
|
209
222
|
create: changes.create,
|
|
210
223
|
update: changes.update,
|
|
211
|
-
conflicts: changes.conflicts
|
|
224
|
+
conflicts: changes.conflicts,
|
|
212
225
|
});
|
|
213
226
|
yield this.processSecrets(hooks);
|
|
214
227
|
});
|
|
@@ -23,56 +23,60 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
|
|
26
|
+
//TODO:
|
|
27
27
|
const rules = __importStar(require("./rules"));
|
|
28
|
-
exports.rules = rules;
|
|
29
28
|
const rulesConfigs = __importStar(require("./rulesConfigs"));
|
|
30
|
-
exports.rulesConfigs = rulesConfigs;
|
|
31
29
|
const hooks = __importStar(require("./hooks"));
|
|
32
|
-
exports.hooks = hooks;
|
|
33
30
|
const pages = __importStar(require("./pages"));
|
|
34
|
-
exports.pages = pages;
|
|
35
31
|
const resourceServers = __importStar(require("./resourceServers"));
|
|
36
|
-
exports.resourceServers = resourceServers;
|
|
37
32
|
const databases = __importStar(require("./databases"));
|
|
38
|
-
exports.databases = databases;
|
|
39
33
|
const connections = __importStar(require("./connections"));
|
|
40
|
-
exports.connections = connections;
|
|
41
34
|
const clients = __importStar(require("./clients"));
|
|
42
|
-
exports.clients = clients;
|
|
43
35
|
const tenant = __importStar(require("./tenant"));
|
|
44
|
-
exports.tenant = tenant;
|
|
45
36
|
const emailProvider = __importStar(require("./emailProvider"));
|
|
46
|
-
exports.emailProvider = emailProvider;
|
|
47
37
|
const emailTemplates = __importStar(require("./emailTemplates"));
|
|
48
|
-
exports.emailTemplates = emailTemplates;
|
|
49
38
|
const clientGrants = __importStar(require("./clientGrants"));
|
|
50
|
-
exports.clientGrants = clientGrants;
|
|
51
39
|
const guardianFactors = __importStar(require("./guardianFactors"));
|
|
52
|
-
exports.guardianFactors = guardianFactors;
|
|
53
40
|
const guardianFactorProviders = __importStar(require("./guardianFactorProviders"));
|
|
54
|
-
exports.guardianFactorProviders = guardianFactorProviders;
|
|
55
41
|
const guardianFactorTemplates = __importStar(require("./guardianFactorTemplates"));
|
|
56
|
-
exports.guardianFactorTemplates = guardianFactorTemplates;
|
|
57
42
|
const guardianPolicies = __importStar(require("./guardianPolicies"));
|
|
58
|
-
exports.guardianPolicies = guardianPolicies;
|
|
59
43
|
const guardianPhoneFactorSelectedProvider = __importStar(require("./guardianPhoneFactorSelectedProvider"));
|
|
60
|
-
exports.guardianPhoneFactorSelectedProvider = guardianPhoneFactorSelectedProvider;
|
|
61
44
|
const guardianPhoneFactorMessageTypes = __importStar(require("./guardianPhoneFactorMessageTypes"));
|
|
62
|
-
exports.guardianPhoneFactorMessageTypes = guardianPhoneFactorMessageTypes;
|
|
63
45
|
const roles = __importStar(require("./roles"));
|
|
64
|
-
exports.roles = roles;
|
|
65
46
|
const branding = __importStar(require("./branding"));
|
|
66
|
-
exports.branding = branding;
|
|
67
47
|
const prompts = __importStar(require("./prompts"));
|
|
68
|
-
exports.prompts = prompts;
|
|
69
48
|
const migrations = __importStar(require("./migrations"));
|
|
70
|
-
exports.migrations = migrations;
|
|
71
49
|
const actions = __importStar(require("./actions"));
|
|
72
|
-
exports.actions = actions;
|
|
73
50
|
const triggers = __importStar(require("./triggers"));
|
|
74
|
-
exports.triggers = triggers;
|
|
75
51
|
const organizations = __importStar(require("./organizations"));
|
|
76
|
-
exports.organizations = organizations;
|
|
77
52
|
const attackProtection = __importStar(require("./attackProtection"));
|
|
78
|
-
|
|
53
|
+
const auth0ApiHandlers = {
|
|
54
|
+
rules,
|
|
55
|
+
rulesConfigs,
|
|
56
|
+
hooks,
|
|
57
|
+
pages,
|
|
58
|
+
resourceServers,
|
|
59
|
+
clients,
|
|
60
|
+
databases,
|
|
61
|
+
connections,
|
|
62
|
+
tenant,
|
|
63
|
+
emailProvider,
|
|
64
|
+
emailTemplates,
|
|
65
|
+
clientGrants,
|
|
66
|
+
guardianFactors,
|
|
67
|
+
guardianFactorProviders,
|
|
68
|
+
guardianFactorTemplates,
|
|
69
|
+
guardianPolicies,
|
|
70
|
+
guardianPhoneFactorSelectedProvider,
|
|
71
|
+
guardianPhoneFactorMessageTypes,
|
|
72
|
+
roles,
|
|
73
|
+
branding,
|
|
74
|
+
//@ts-ignore because prompts have not been universally implemented yet
|
|
75
|
+
prompts,
|
|
76
|
+
migrations,
|
|
77
|
+
actions,
|
|
78
|
+
triggers,
|
|
79
|
+
organizations,
|
|
80
|
+
attackProtection,
|
|
81
|
+
};
|
|
82
|
+
exports.default = auth0ApiHandlers; // TODO: apply stronger types to schema properties
|
|
@@ -46,12 +46,13 @@ const default_1 = __importStar(require("./default"));
|
|
|
46
46
|
const logger_1 = __importDefault(require("../../logger"));
|
|
47
47
|
exports.schema = {
|
|
48
48
|
type: 'object',
|
|
49
|
-
additionalProperties: { type: 'boolean' }
|
|
49
|
+
additionalProperties: { type: 'boolean' },
|
|
50
50
|
};
|
|
51
51
|
class MigrationsHandler extends default_1.default {
|
|
52
52
|
constructor(options) {
|
|
53
53
|
super(Object.assign(Object.assign({}, options), { type: 'migrations' }));
|
|
54
54
|
}
|
|
55
|
+
//TODO: standardize empty object literal with more intentional empty indicator
|
|
55
56
|
getType() {
|
|
56
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
58
|
try {
|
|
@@ -61,13 +61,13 @@ exports.schema = {
|
|
|
61
61
|
type: 'object',
|
|
62
62
|
properties: {
|
|
63
63
|
connection_id: { type: 'string' },
|
|
64
|
-
assign_membership_on_login: { type: 'boolean' }
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
64
|
+
assign_membership_on_login: { type: 'boolean' },
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
68
|
},
|
|
69
|
-
required: ['name']
|
|
70
|
-
}
|
|
69
|
+
required: ['name'],
|
|
70
|
+
},
|
|
71
71
|
};
|
|
72
72
|
class OrganizationsHandler extends default_1.default {
|
|
73
73
|
constructor(config) {
|
|
@@ -80,16 +80,21 @@ class OrganizationsHandler extends default_1.default {
|
|
|
80
80
|
}
|
|
81
81
|
deleteOrganizations(data) {
|
|
82
82
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
if (this.config('AUTH0_ALLOW_DELETE') === 'true' ||
|
|
84
|
-
|
|
83
|
+
if (this.config('AUTH0_ALLOW_DELETE') === 'true' ||
|
|
84
|
+
this.config('AUTH0_ALLOW_DELETE') === true) {
|
|
85
|
+
yield this.client.pool
|
|
86
|
+
.addEachTask({
|
|
85
87
|
data: data || [],
|
|
86
|
-
generator: (item) => this.deleteOrganization(item)
|
|
88
|
+
generator: (item) => this.deleteOrganization(item)
|
|
89
|
+
.then(() => {
|
|
87
90
|
this.didDelete(item);
|
|
88
91
|
this.deleted += 1;
|
|
89
|
-
}).catch((err) => {
|
|
90
|
-
throw new Error(`Problem deleting ${this.type} ${this.objString(item)}\n${err}`);
|
|
91
92
|
})
|
|
92
|
-
|
|
93
|
+
.catch((err) => {
|
|
94
|
+
throw new Error(`Problem deleting ${this.type} ${this.objString(item)}\n${err}`);
|
|
95
|
+
}),
|
|
96
|
+
})
|
|
97
|
+
.promise();
|
|
93
98
|
}
|
|
94
99
|
else {
|
|
95
100
|
logger_1.default.warn(`Detected the following organizations should be deleted. Doing so may be destructive.\nYou can enable deletes by setting 'AUTH0_ALLOW_DELETE' to true in the config
|
|
@@ -110,15 +115,19 @@ class OrganizationsHandler extends default_1.default {
|
|
|
110
115
|
}
|
|
111
116
|
createOrganizations(creates) {
|
|
112
117
|
return __awaiter(this, void 0, void 0, function* () {
|
|
113
|
-
yield this.client.pool
|
|
118
|
+
yield this.client.pool
|
|
119
|
+
.addEachTask({
|
|
114
120
|
data: creates || [],
|
|
115
|
-
generator: (item) => this.createOrganization(item)
|
|
121
|
+
generator: (item) => this.createOrganization(item)
|
|
122
|
+
.then((data) => {
|
|
116
123
|
this.didCreate(data);
|
|
117
124
|
this.created += 1;
|
|
118
|
-
}).catch((err) => {
|
|
119
|
-
throw new Error(`Problem creating ${this.type} ${this.objString(item)}\n${err}`);
|
|
120
125
|
})
|
|
121
|
-
|
|
126
|
+
.catch((err) => {
|
|
127
|
+
throw new Error(`Problem creating ${this.type} ${this.objString(item)}\n${err}`);
|
|
128
|
+
}),
|
|
129
|
+
})
|
|
130
|
+
.promise();
|
|
122
131
|
});
|
|
123
132
|
}
|
|
124
133
|
updateOrganization(org, organizations) {
|
|
@@ -132,7 +141,8 @@ class OrganizationsHandler extends default_1.default {
|
|
|
132
141
|
yield this.client.organizations.update(params, org);
|
|
133
142
|
const connectionsToRemove = existingConnections.filter((c) => !connections.find((x) => x.connection_id === c.connection_id));
|
|
134
143
|
const connectionsToAdd = connections.filter((c) => !existingConnections.find((x) => x.connection_id === c.connection_id));
|
|
135
|
-
const connectionsToUpdate = connections.filter((c) => existingConnections.find((x) => x.connection_id === c.connection_id &&
|
|
144
|
+
const connectionsToUpdate = connections.filter((c) => existingConnections.find((x) => x.connection_id === c.connection_id &&
|
|
145
|
+
x.assign_membership_on_login !== c.assign_membership_on_login));
|
|
136
146
|
// Handle updates first
|
|
137
147
|
yield Promise.all(connectionsToUpdate.map((conn) => this.client.organizations
|
|
138
148
|
.updateEnabledConnection(Object.assign({ connection_id: conn.connection_id }, params), { assign_membership_on_login: conn.assign_membership_on_login })
|
|
@@ -154,15 +164,19 @@ class OrganizationsHandler extends default_1.default {
|
|
|
154
164
|
}
|
|
155
165
|
updateOrganizations(updates, orgs) {
|
|
156
166
|
return __awaiter(this, void 0, void 0, function* () {
|
|
157
|
-
yield this.client.pool
|
|
167
|
+
yield this.client.pool
|
|
168
|
+
.addEachTask({
|
|
158
169
|
data: updates || [],
|
|
159
|
-
generator: (item) => this.updateOrganization(item, orgs)
|
|
170
|
+
generator: (item) => this.updateOrganization(item, orgs)
|
|
171
|
+
.then((data) => {
|
|
160
172
|
this.didUpdate(data);
|
|
161
173
|
this.updated += 1;
|
|
162
|
-
}).catch((err) => {
|
|
163
|
-
throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
|
|
164
174
|
})
|
|
165
|
-
|
|
175
|
+
.catch((err) => {
|
|
176
|
+
throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
|
|
177
|
+
}),
|
|
178
|
+
})
|
|
179
|
+
.promise();
|
|
166
180
|
});
|
|
167
181
|
}
|
|
168
182
|
getType() {
|
|
@@ -174,9 +188,14 @@ class OrganizationsHandler extends default_1.default {
|
|
|
174
188
|
return [];
|
|
175
189
|
}
|
|
176
190
|
try {
|
|
177
|
-
const organizations = yield this.client.organizations.getAll({
|
|
191
|
+
const organizations = yield this.client.organizations.getAll({
|
|
192
|
+
checkpoint: true,
|
|
193
|
+
include_totals: true,
|
|
194
|
+
});
|
|
178
195
|
for (let index = 0; index < organizations.length; index++) {
|
|
179
|
-
const connections = yield this.client.organizations.connections.get({
|
|
196
|
+
const connections = yield this.client.organizations.connections.get({
|
|
197
|
+
id: organizations[index].id,
|
|
198
|
+
});
|
|
180
199
|
organizations[index].connections = connections;
|
|
181
200
|
}
|
|
182
201
|
this.existing = organizations;
|
|
@@ -199,23 +218,33 @@ class OrganizationsHandler extends default_1.default {
|
|
|
199
218
|
return;
|
|
200
219
|
// Gets organizations from destination tenant
|
|
201
220
|
const existing = yield this.getType();
|
|
202
|
-
const existingConnections = yield this.client.connections.getAll({
|
|
221
|
+
const existingConnections = yield this.client.connections.getAll({
|
|
222
|
+
paginate: true,
|
|
223
|
+
include_totals: true,
|
|
224
|
+
});
|
|
203
225
|
// We need to get the connection ids for the names configured so we can link them together
|
|
204
226
|
organizations.forEach((org) => {
|
|
205
|
-
org.connections = (org.connections || [])
|
|
227
|
+
org.connections = (org.connections || [])
|
|
228
|
+
.map((connection) => {
|
|
206
229
|
const { name } = connection;
|
|
207
230
|
delete connection.name;
|
|
208
231
|
return Object.assign(Object.assign({}, connection), { connection_id: (existingConnections.find((c) => c.name === name) || {}).id });
|
|
209
|
-
})
|
|
232
|
+
})
|
|
233
|
+
.filter((connection) => !!connection.connection_id);
|
|
210
234
|
});
|
|
211
235
|
const changes = (0, calculateChanges_1.calculateChanges)({
|
|
212
236
|
handler: this,
|
|
213
237
|
assets: organizations,
|
|
214
238
|
existing,
|
|
215
|
-
identifiers: ['id', 'name']
|
|
239
|
+
identifiers: ['id', 'name'],
|
|
240
|
+
allowDelete: false, //TODO: actually pass in correct allowDelete value
|
|
216
241
|
});
|
|
217
242
|
logger_1.default.debug(`Start processChanges for organizations [delete:${changes.del.length}] [update:${changes.update.length}], [create:${changes.create.length}]`);
|
|
218
|
-
const myChanges = [
|
|
243
|
+
const myChanges = [
|
|
244
|
+
{ del: changes.del },
|
|
245
|
+
{ create: changes.create },
|
|
246
|
+
{ update: changes.update },
|
|
247
|
+
];
|
|
219
248
|
yield Promise.all(myChanges.map((change) => __awaiter(this, void 0, void 0, function* () {
|
|
220
249
|
switch (true) {
|
|
221
250
|
case change.del && change.del.length > 0:
|
|
@@ -225,7 +254,8 @@ class OrganizationsHandler extends default_1.default {
|
|
|
225
254
|
yield this.createOrganizations(changes.create);
|
|
226
255
|
break;
|
|
227
256
|
case change.update && change.update.length > 0:
|
|
228
|
-
|
|
257
|
+
if (change.update)
|
|
258
|
+
yield this.updateOrganizations(change.update, existing);
|
|
229
259
|
break;
|
|
230
260
|
default:
|
|
231
261
|
break;
|
|
@@ -15,13 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.schema = exports.pageNameMap = exports.supportedPages = void 0;
|
|
16
16
|
const default_1 = __importDefault(require("./default"));
|
|
17
17
|
const constants_1 = __importDefault(require("../../constants"));
|
|
18
|
-
exports.supportedPages = constants_1.default.PAGE_NAMES
|
|
19
|
-
.filter((p) => p.includes('.json'))
|
|
20
|
-
.map((p) => p.replace('.json', ''));
|
|
18
|
+
exports.supportedPages = constants_1.default.PAGE_NAMES.filter((p) => p.includes('.json')).map((p) => p.replace('.json', ''));
|
|
21
19
|
exports.pageNameMap = {
|
|
22
20
|
guardian_multifactor: 'guardian_mfa_page',
|
|
23
21
|
password_reset: 'change_password',
|
|
24
|
-
error_page: 'error_page'
|
|
22
|
+
error_page: 'error_page',
|
|
25
23
|
};
|
|
26
24
|
// With this schema, we can only validate property types but not valid properties on per type basis
|
|
27
25
|
exports.schema = {
|
|
@@ -33,12 +31,12 @@ exports.schema = {
|
|
|
33
31
|
html: { type: 'string', default: '' },
|
|
34
32
|
url: { type: 'string' },
|
|
35
33
|
show_log_link: { type: 'boolean' },
|
|
36
|
-
enabled: { type: 'boolean' }
|
|
34
|
+
enabled: { type: 'boolean' },
|
|
37
35
|
},
|
|
38
|
-
required: ['name']
|
|
39
|
-
}
|
|
36
|
+
required: ['name'],
|
|
37
|
+
},
|
|
40
38
|
};
|
|
41
|
-
class
|
|
39
|
+
class PagesHandler extends default_1.default {
|
|
42
40
|
constructor(options) {
|
|
43
41
|
super(Object.assign(Object.assign({}, options), { type: 'pages' }));
|
|
44
42
|
}
|
|
@@ -47,13 +45,17 @@ class PageHandler extends default_1.default {
|
|
|
47
45
|
}
|
|
48
46
|
updateLoginPage(page) {
|
|
49
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
-
const globalClient = yield this.client.clients.getAll({
|
|
48
|
+
const globalClient = yield this.client.clients.getAll({
|
|
49
|
+
is_global: true,
|
|
50
|
+
paginate: true,
|
|
51
|
+
include_totals: true,
|
|
52
|
+
});
|
|
51
53
|
if (!globalClient[0]) {
|
|
52
54
|
throw new Error('Unable to find global client id when trying to update the login page');
|
|
53
55
|
}
|
|
54
56
|
yield this.client.clients.update({ client_id: globalClient[0].client_id }, {
|
|
55
57
|
custom_login_page: page.html,
|
|
56
|
-
custom_login_page_on: page.enabled
|
|
58
|
+
custom_login_page_on: page.enabled,
|
|
57
59
|
});
|
|
58
60
|
this.updated += 1;
|
|
59
61
|
this.didUpdate(page);
|
|
@@ -86,7 +88,11 @@ class PageHandler extends default_1.default {
|
|
|
86
88
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
89
|
const pages = [];
|
|
88
90
|
// Login page is handled via the global client
|
|
89
|
-
const globalClient = yield this.client.clients.getAll({
|
|
91
|
+
const globalClient = yield this.client.clients.getAll({
|
|
92
|
+
is_global: true,
|
|
93
|
+
paginate: true,
|
|
94
|
+
include_totals: true,
|
|
95
|
+
});
|
|
90
96
|
if (!globalClient[0]) {
|
|
91
97
|
throw new Error('Unable to find global client id when trying to dump the login page');
|
|
92
98
|
}
|
|
@@ -94,7 +100,7 @@ class PageHandler extends default_1.default {
|
|
|
94
100
|
pages.push({
|
|
95
101
|
name: 'login',
|
|
96
102
|
enabled: globalClient[0].custom_login_page_on,
|
|
97
|
-
html: globalClient[0].custom_login_page
|
|
103
|
+
html: globalClient[0].custom_login_page,
|
|
98
104
|
});
|
|
99
105
|
}
|
|
100
106
|
const tenantSettings = yield this.client.tenant.getSettings();
|
|
@@ -115,7 +121,7 @@ class PageHandler extends default_1.default {
|
|
|
115
121
|
return;
|
|
116
122
|
// Login page is handled via the global client
|
|
117
123
|
const loginPage = pages.find((p) => p.name === 'login');
|
|
118
|
-
if (loginPage) {
|
|
124
|
+
if (loginPage !== undefined) {
|
|
119
125
|
yield this.updateLoginPage(loginPage);
|
|
120
126
|
}
|
|
121
127
|
// Rest of pages are on tenant level settings
|
|
@@ -123,4 +129,4 @@ class PageHandler extends default_1.default {
|
|
|
123
129
|
});
|
|
124
130
|
}
|
|
125
131
|
}
|
|
126
|
-
exports.default =
|
|
132
|
+
exports.default = PagesHandler;
|
|
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.schema = void 0;
|
|
16
|
+
//@ts-nocheck because prompts haven't been fully implemented in this codebase yet
|
|
16
17
|
const default_1 = __importDefault(require("./default"));
|
|
17
18
|
exports.schema = { type: 'object' };
|
|
18
19
|
class PromptsHandler extends default_1.default {
|
|
@@ -13,13 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.schema = exports.excludeSchema = void 0;
|
|
16
|
-
const
|
|
16
|
+
const validationError_1 = __importDefault(require("../../validationError"));
|
|
17
17
|
const constants_1 = __importDefault(require("../../constants"));
|
|
18
18
|
const default_1 = __importDefault(require("./default"));
|
|
19
19
|
const calculateChanges_1 = require("../../calculateChanges");
|
|
20
20
|
exports.excludeSchema = {
|
|
21
21
|
type: 'array',
|
|
22
|
-
items: { type: 'string' }
|
|
22
|
+
items: { type: 'string' },
|
|
23
23
|
};
|
|
24
24
|
exports.schema = {
|
|
25
25
|
type: 'array',
|
|
@@ -34,20 +34,19 @@ exports.schema = {
|
|
|
34
34
|
type: 'object',
|
|
35
35
|
properties: {
|
|
36
36
|
name: { type: 'string' },
|
|
37
|
-
description: { type: 'string' }
|
|
38
|
-
}
|
|
39
|
-
}
|
|
37
|
+
description: { type: 'string' },
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
40
|
},
|
|
41
41
|
enforce_policies: { type: 'boolean' },
|
|
42
|
-
token_dialect: { type: 'string' }
|
|
42
|
+
token_dialect: { type: 'string' },
|
|
43
43
|
},
|
|
44
|
-
required: ['name', 'identifier']
|
|
45
|
-
}
|
|
44
|
+
required: ['name', 'identifier'],
|
|
45
|
+
},
|
|
46
46
|
};
|
|
47
47
|
class ResourceServersHandler extends default_1.default {
|
|
48
48
|
constructor(options) {
|
|
49
|
-
super(Object.assign(Object.assign({}, options), { type: 'resourceServers', stripUpdateFields: ['identifier']
|
|
50
|
-
}));
|
|
49
|
+
super(Object.assign(Object.assign({}, options), { type: 'resourceServers', stripUpdateFields: ['identifier'] }));
|
|
51
50
|
}
|
|
52
51
|
objString(resourceServer) {
|
|
53
52
|
return super.objString({ name: resourceServer.name, identifier: resourceServer.identifier });
|
|
@@ -56,7 +55,10 @@ class ResourceServersHandler extends default_1.default {
|
|
|
56
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
56
|
if (this.existing)
|
|
58
57
|
return this.existing;
|
|
59
|
-
const resourceServers = yield this.client.resourceServers.getAll({
|
|
58
|
+
const resourceServers = yield this.client.resourceServers.getAll({
|
|
59
|
+
paginate: true,
|
|
60
|
+
include_totals: true,
|
|
61
|
+
});
|
|
60
62
|
return resourceServers.filter((rs) => rs.name !== constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME);
|
|
61
63
|
});
|
|
62
64
|
}
|
|
@@ -65,7 +67,12 @@ class ResourceServersHandler extends default_1.default {
|
|
|
65
67
|
let { resourceServers } = assets;
|
|
66
68
|
// Do nothing if not set
|
|
67
69
|
if (!resourceServers)
|
|
68
|
-
return {
|
|
70
|
+
return {
|
|
71
|
+
del: [],
|
|
72
|
+
create: [],
|
|
73
|
+
conflicts: [],
|
|
74
|
+
update: [],
|
|
75
|
+
};
|
|
69
76
|
const excluded = (assets.exclude && assets.exclude.resourceServers) || [];
|
|
70
77
|
let existing = yield this.getType();
|
|
71
78
|
// Filter excluded
|
|
@@ -75,7 +82,8 @@ class ResourceServersHandler extends default_1.default {
|
|
|
75
82
|
handler: this,
|
|
76
83
|
assets: resourceServers,
|
|
77
84
|
existing,
|
|
78
|
-
identifiers: ['id', 'identifier']
|
|
85
|
+
identifiers: ['id', 'identifier'],
|
|
86
|
+
allowDelete: false, //TODO: actually pass in correct allowDelete value
|
|
79
87
|
});
|
|
80
88
|
});
|
|
81
89
|
}
|
|
@@ -90,7 +98,7 @@ class ResourceServersHandler extends default_1.default {
|
|
|
90
98
|
return;
|
|
91
99
|
const mgmtAPIResource = resourceServers.find((r) => r.name === constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME);
|
|
92
100
|
if (mgmtAPIResource) {
|
|
93
|
-
throw new
|
|
101
|
+
throw new validationError_1.default(`You can not configure the '${constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME}'.`);
|
|
94
102
|
}
|
|
95
103
|
yield _super.validate.call(this, assets);
|
|
96
104
|
});
|