@budibase/server 2.4.44-alpha.7 → 2.4.44-alpha.9

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.8cb2f57a.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.0e1ef7eb.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.d013cac9.css">
 </head>
 

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.4.44-alpha.6",
+    "version": "2.4.44-alpha.8",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -26,6 +26,7 @@
         "dev:stack:down": "node scripts/dev/manage.js down",
         "dev:stack:nuke": "node scripts/dev/manage.js nuke",
         "dev:builder": "yarn run dev:stack:up && nodemon",
+        "dev:built": "yarn run dev:stack:up && yarn run run:docker",
         "specs": "ts-node specs/generate.ts && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
         "initialise": "node scripts/initialise.js",
         "env:multi:enable": "node scripts/multiTenancy.js enable",
@@ -44,12 +45,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.4.44-alpha.6",
-        "@budibase/client": "2.4.44-alpha.6",
-        "@budibase/pro": "2.4.44-alpha.6",
-        "@budibase/shared-core": "2.4.44-alpha.6",
-        "@budibase/string-templates": "2.4.44-alpha.6",
-        "@budibase/types": "2.4.44-alpha.6",
+        "@budibase/backend-core": "2.4.44-alpha.8",
+        "@budibase/client": "2.4.44-alpha.8",
+        "@budibase/pro": "2.4.44-alpha.8",
+        "@budibase/shared-core": "2.4.44-alpha.8",
+        "@budibase/string-templates": "2.4.44-alpha.8",
+        "@budibase/types": "2.4.44-alpha.8",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/startup.js

@@ -77,8 +77,10 @@ function initPro() {
     });
 }
 function shutdown(server) {
-    server.close();
-    server.destroy();
+    if (server) {
+        server.close();
+        server.destroy();
+    }
 }
 function startup(app, server) {
     var _a;
@@ -102,29 +104,7 @@ function startup(app, server) {
             }
             catch (e) {
                 backend_core_1.logging.logAlert("Error performing migrations. Exiting.", e);
-                shutdown();
-            }
-        }
-        // check and create admin user if required
-        if (environment_1.default.SELF_HOSTED &&
-            !environment_1.default.MULTI_TENANCY &&
-            environment_1.default.BB_ADMIN_USER_EMAIL &&
-            environment_1.default.BB_ADMIN_USER_PASSWORD) {
-            const checklist = yield (0, workerRequests_1.getChecklist)();
-            if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
-                try {
-                    const tenantId = backend_core_1.tenancy.getTenantId();
-                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
-                    // Need to set up an API key for automated integration tests
-                    if (environment_1.default.isTest()) {
-                        yield (0, workerRequests_1.generateApiKey)(user._id);
-                    }
-                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
-                }
-                catch (e) {
-                    backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
-                    shutdown();
-                }
+                shutdown(server);
             }
         }
         // monitor plugin directory if required
@@ -148,6 +128,30 @@ function startup(app, server) {
             // bring routes online as final step once everything ready
             yield initRoutes(app);
         }
+        // check and create admin user if required
+        // this must be run after the api has been initialised due to
+        // the app user sync
+        if (environment_1.default.SELF_HOSTED &&
+            !environment_1.default.MULTI_TENANCY &&
+            environment_1.default.BB_ADMIN_USER_EMAIL &&
+            environment_1.default.BB_ADMIN_USER_PASSWORD) {
+            const checklist = yield (0, workerRequests_1.getChecklist)();
+            if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
+                try {
+                    const tenantId = backend_core_1.tenancy.getTenantId();
+                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
+                    // Need to set up an API key for automated integration tests
+                    if (environment_1.default.isTest()) {
+                        yield (0, workerRequests_1.generateApiKey)(user._id);
+                    }
+                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
+                }
+                catch (e) {
+                    backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
+                    shutdown(server);
+                }
+            }
+        }
     });
 }
 exports.startup = startup;