@webiny/api-serverless-cms 5.40.5 → 5.40.6-beta.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/package.json +19 -19
- package/tenancy/InstallTenant.d.ts +1 -0
- package/tenancy/InstallTenant.js +71 -26
- package/tenancy/InstallTenant.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webiny/api-serverless-cms",
|
|
3
|
-
"version": "5.40.
|
|
3
|
+
"version": "5.40.6-beta.0",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -9,29 +9,29 @@
|
|
|
9
9
|
"description": "Core package for all of our API packages.",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@webiny/api": "5.40.
|
|
13
|
-
"@webiny/api-aco": "5.40.
|
|
14
|
-
"@webiny/api-file-manager": "5.40.
|
|
15
|
-
"@webiny/api-form-builder": "5.40.
|
|
16
|
-
"@webiny/api-headless-cms": "5.40.
|
|
17
|
-
"@webiny/api-i18n": "5.40.
|
|
18
|
-
"@webiny/api-i18n-content": "5.40.
|
|
19
|
-
"@webiny/api-page-builder": "5.40.
|
|
20
|
-
"@webiny/api-page-builder-aco": "5.40.
|
|
21
|
-
"@webiny/api-prerendering-service": "5.40.
|
|
22
|
-
"@webiny/api-security": "5.40.
|
|
23
|
-
"@webiny/api-tenancy": "5.40.
|
|
24
|
-
"@webiny/error": "5.40.
|
|
25
|
-
"@webiny/handler-client": "5.40.
|
|
26
|
-
"@webiny/handler-graphql": "5.40.
|
|
12
|
+
"@webiny/api": "5.40.6-beta.0",
|
|
13
|
+
"@webiny/api-aco": "5.40.6-beta.0",
|
|
14
|
+
"@webiny/api-file-manager": "5.40.6-beta.0",
|
|
15
|
+
"@webiny/api-form-builder": "5.40.6-beta.0",
|
|
16
|
+
"@webiny/api-headless-cms": "5.40.6-beta.0",
|
|
17
|
+
"@webiny/api-i18n": "5.40.6-beta.0",
|
|
18
|
+
"@webiny/api-i18n-content": "5.40.6-beta.0",
|
|
19
|
+
"@webiny/api-page-builder": "5.40.6-beta.0",
|
|
20
|
+
"@webiny/api-page-builder-aco": "5.40.6-beta.0",
|
|
21
|
+
"@webiny/api-prerendering-service": "5.40.6-beta.0",
|
|
22
|
+
"@webiny/api-security": "5.40.6-beta.0",
|
|
23
|
+
"@webiny/api-tenancy": "5.40.6-beta.0",
|
|
24
|
+
"@webiny/error": "5.40.6-beta.0",
|
|
25
|
+
"@webiny/handler-client": "5.40.6-beta.0",
|
|
26
|
+
"@webiny/handler-graphql": "5.40.6-beta.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "7.24.1",
|
|
30
30
|
"@babel/core": "7.24.3",
|
|
31
31
|
"@babel/preset-env": "7.24.3",
|
|
32
32
|
"@babel/preset-typescript": "7.24.1",
|
|
33
|
-
"@webiny/cli": "5.40.
|
|
34
|
-
"@webiny/project-utils": "5.40.
|
|
33
|
+
"@webiny/cli": "5.40.6-beta.0",
|
|
34
|
+
"@webiny/project-utils": "5.40.6-beta.0",
|
|
35
35
|
"rimraf": "5.0.5",
|
|
36
36
|
"ttypescript": "1.5.15",
|
|
37
37
|
"typescript": "4.7.4"
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"build": "yarn webiny run build",
|
|
45
45
|
"watch": "yarn webiny run watch"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "c0bf7d9bfe72b0689b29c84506f3168515a78517"
|
|
48
48
|
}
|
package/tenancy/InstallTenant.js
CHANGED
|
@@ -23,49 +23,94 @@ class InstallTenant {
|
|
|
23
23
|
await this.context.tenancy.setVersion(this.context.WEBINY_VERSION);
|
|
24
24
|
|
|
25
25
|
// SECURITY: Create initial security groups.
|
|
26
|
-
await this.
|
|
26
|
+
await this.runOrThrow(async () => {
|
|
27
|
+
const isInstalled = await this.context.security.getVersion();
|
|
28
|
+
if (!isInstalled) {
|
|
29
|
+
await this.context.security.install();
|
|
30
|
+
}
|
|
31
|
+
}, "SECURITY_INSTALL");
|
|
27
32
|
|
|
28
33
|
// ADMIN USERS: Optionally, create an admin user for this tenant.
|
|
29
|
-
|
|
30
|
-
await this.context.adminUsers.
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
await this.runOrThrow(async () => {
|
|
35
|
+
const isInstalled = await this.context.adminUsers.getVersion();
|
|
36
|
+
if (isInstalled) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
if (config.adminUsers) {
|
|
40
|
+
await this.context.adminUsers.install(config.adminUsers);
|
|
41
|
+
} else {
|
|
42
|
+
// We always mark `adminUsers` as installed, regardless of the config.
|
|
43
|
+
await this.context.adminUsers.setVersion(this.context.WEBINY_VERSION);
|
|
44
|
+
}
|
|
45
|
+
}, "ADMIN_USERS_INSTALL");
|
|
35
46
|
|
|
36
47
|
// I18N: Create a default locale.
|
|
37
|
-
await this.
|
|
38
|
-
|
|
39
|
-
|
|
48
|
+
await this.runOrThrow(async () => {
|
|
49
|
+
const isInstalled = await this.context.i18n.system.getSystemVersion();
|
|
50
|
+
if (isInstalled) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
await this.context.i18n.system.installSystem({
|
|
54
|
+
code: config.i18n.defaultLocaleCode
|
|
55
|
+
});
|
|
56
|
+
}, "I18N_INSTALL");
|
|
40
57
|
|
|
41
58
|
// CMS
|
|
42
|
-
await this.
|
|
59
|
+
await this.runOrThrow(async () => {
|
|
60
|
+
const isInstalled = await this.context.cms.getSystemVersion();
|
|
61
|
+
if (isInstalled) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
await this.context.cms.installSystem();
|
|
65
|
+
}, "CMS_INSTALL");
|
|
43
66
|
|
|
44
67
|
// FILE MANAGER: Create File Manager settings.
|
|
45
68
|
const srcPrefix = config.fileManager ? `${new URL(config.fileManager.assetDeliveryDomain).origin}/files/` : fmSettings?.srcPrefix;
|
|
46
|
-
await this.
|
|
47
|
-
|
|
48
|
-
|
|
69
|
+
await this.runOrThrow(async () => {
|
|
70
|
+
const isInstalled = await this.context.fileManager.getVersion();
|
|
71
|
+
if (isInstalled) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
await this.context.fileManager.install({
|
|
75
|
+
srcPrefix: srcPrefix || ""
|
|
76
|
+
});
|
|
77
|
+
}, "FILE_MANAGER_INSTALL");
|
|
49
78
|
|
|
50
79
|
// PAGE BUILDER: Create Page Builder settings.
|
|
51
|
-
await this.
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
80
|
+
await this.runOrThrow(async () => {
|
|
81
|
+
const isInstalled = await this.context.pageBuilder.getSystemVersion();
|
|
82
|
+
if (isInstalled) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
await this.context.pageBuilder.installSystem({
|
|
86
|
+
name: config.pageBuilder?.websiteName ?? tenant.name,
|
|
87
|
+
insertDemoData: config.pageBuilder?.insertDemoData ?? false
|
|
88
|
+
});
|
|
89
|
+
}, "PAGE_BUILDER_INSTALL");
|
|
55
90
|
|
|
56
91
|
// FORM BUILDER
|
|
57
|
-
await this.
|
|
58
|
-
|
|
92
|
+
await this.runOrThrow(async () => {
|
|
93
|
+
const isInstalled = await this.context.formBuilder.getSystemVersion();
|
|
94
|
+
if (isInstalled) {
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
await this.context.formBuilder.installSystem({});
|
|
98
|
+
}, "FORM_BUILDER_INSTALL");
|
|
99
|
+
} finally {
|
|
100
|
+
this.context.tenancy.setCurrentTenant(currentTenant);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
async runOrThrow(cb, errorCode) {
|
|
104
|
+
try {
|
|
105
|
+
await cb();
|
|
106
|
+
} catch (err) {
|
|
59
107
|
throw new _error.default({
|
|
60
|
-
message:
|
|
61
|
-
code:
|
|
108
|
+
message: err.message,
|
|
109
|
+
code: `INSTALL_TENANT:${errorCode}`,
|
|
62
110
|
data: {
|
|
63
|
-
|
|
64
|
-
error: e
|
|
111
|
+
error: err
|
|
65
112
|
}
|
|
66
113
|
});
|
|
67
|
-
} finally {
|
|
68
|
-
this.context.tenancy.setCurrentTenant(currentTenant);
|
|
69
114
|
}
|
|
70
115
|
}
|
|
71
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_error","_interopRequireDefault","require","InstallTenant","constructor","context","execute","tenant","config","currentTenant","tenancy","getCurrentTenant","fmSettings","fileManager","getSettings","setCurrentTenant","setVersion","WEBINY_VERSION","security","install","adminUsers","i18n","system","installSystem","code","defaultLocaleCode","cms","srcPrefix","URL","assetDeliveryDomain","origin","pageBuilder","name","websiteName","insertDemoData","formBuilder","
|
|
1
|
+
{"version":3,"names":["_error","_interopRequireDefault","require","InstallTenant","constructor","context","execute","tenant","config","currentTenant","tenancy","getCurrentTenant","fmSettings","fileManager","getSettings","setCurrentTenant","setVersion","WEBINY_VERSION","runOrThrow","isInstalled","security","getVersion","install","adminUsers","i18n","system","getSystemVersion","installSystem","code","defaultLocaleCode","cms","srcPrefix","URL","assetDeliveryDomain","origin","pageBuilder","name","websiteName","insertDemoData","formBuilder","cb","errorCode","err","Error","message","data","error","exports"],"sources":["InstallTenant.ts"],"sourcesContent":["import { Tenant } from \"@webiny/api-tenancy/types\";\nimport Error from \"@webiny/error\";\nimport { Context } from \"~/index\";\n\nexport interface AdminUserInput {\n firstName: string;\n lastName: string;\n email: string;\n password: string;\n group?: string;\n}\n\nexport type AdminUsersInstallationConfig = AdminUserInput | undefined;\n\nexport interface I18nInstallationConfig {\n defaultLocaleCode: string;\n}\n\nexport interface FileManagerInstallationConfig {\n /**\n * Asset delivery origin. This usually points to the main Webiny API origin.\n * E.g., https://some.domain.com/\n *\n * You can change this later in the tenant's File Manager settings.\n */\n assetDeliveryDomain: string;\n}\n\nexport interface PageBuilderInstallationConfig {\n websiteName: string;\n insertDemoData: boolean;\n}\n\nexport interface TenantConfig {\n i18n: I18nInstallationConfig;\n adminUsers?: AdminUsersInstallationConfig;\n fileManager?: FileManagerInstallationConfig;\n pageBuilder?: PageBuilderInstallationConfig;\n}\n\nexport class InstallTenant {\n private readonly context: Context;\n\n constructor(context: Context) {\n this.context = context;\n }\n\n async execute(tenant: Tenant, config: TenantConfig): Promise<void> {\n const currentTenant = this.context.tenancy.getCurrentTenant();\n\n // Get current tenant's FileManager settings.\n const fmSettings = await this.context.fileManager.getSettings();\n\n // Switch tenant to the one being installed.\n this.context.tenancy.setCurrentTenant(tenant);\n\n try {\n // TENANCY: Set the app version, as the tenant is already created.\n await this.context.tenancy.setVersion(this.context.WEBINY_VERSION);\n\n // SECURITY: Create initial security groups.\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.security.getVersion();\n if (!isInstalled) {\n await this.context.security.install();\n }\n }, \"SECURITY_INSTALL\");\n\n // ADMIN USERS: Optionally, create an admin user for this tenant.\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.adminUsers.getVersion();\n if (isInstalled) {\n return;\n }\n\n if (config.adminUsers) {\n await this.context.adminUsers.install(config.adminUsers);\n } else {\n // We always mark `adminUsers` as installed, regardless of the config.\n await this.context.adminUsers.setVersion(this.context.WEBINY_VERSION);\n }\n }, \"ADMIN_USERS_INSTALL\");\n\n // I18N: Create a default locale.\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.i18n.system.getSystemVersion();\n if (isInstalled) {\n return;\n }\n\n await this.context.i18n.system.installSystem({\n code: config.i18n.defaultLocaleCode\n });\n }, \"I18N_INSTALL\");\n\n // CMS\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.cms.getSystemVersion();\n if (isInstalled) {\n return;\n }\n await this.context.cms.installSystem();\n }, \"CMS_INSTALL\");\n\n // FILE MANAGER: Create File Manager settings.\n const srcPrefix = config.fileManager\n ? `${new URL(config.fileManager.assetDeliveryDomain).origin}/files/`\n : fmSettings?.srcPrefix;\n\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.fileManager.getVersion();\n if (isInstalled) {\n return;\n }\n\n await this.context.fileManager.install({ srcPrefix: srcPrefix || \"\" });\n }, \"FILE_MANAGER_INSTALL\");\n\n // PAGE BUILDER: Create Page Builder settings.\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.pageBuilder.getSystemVersion();\n if (isInstalled) {\n return;\n }\n await this.context.pageBuilder.installSystem({\n name: config.pageBuilder?.websiteName ?? tenant.name,\n insertDemoData: config.pageBuilder?.insertDemoData ?? false\n });\n }, \"PAGE_BUILDER_INSTALL\");\n\n // FORM BUILDER\n await this.runOrThrow(async () => {\n const isInstalled = await this.context.formBuilder.getSystemVersion();\n if (isInstalled) {\n return;\n }\n await this.context.formBuilder.installSystem({});\n }, \"FORM_BUILDER_INSTALL\");\n } finally {\n this.context.tenancy.setCurrentTenant(currentTenant);\n }\n }\n\n private async runOrThrow(cb: () => Promise<void>, errorCode: string): Promise<void> {\n try {\n await cb();\n } catch (err) {\n throw new Error({\n message: err.message,\n code: `INSTALL_TENANT:${errorCode}`,\n data: {\n error: err\n }\n });\n }\n }\n}\n"],"mappings":"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","ignoreList":[]}
|