@budibase/server 2.7.25-alpha.2 → 2.7.25-alpha.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.7.25-alpha.2",
+  "version": "2.7.25-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -46,12 +46,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.7.25-alpha.2",
-    "@budibase/client": "2.7.25-alpha.2",
-    "@budibase/pro": "2.7.25-alpha.2",
-    "@budibase/shared-core": "2.7.25-alpha.2",
-    "@budibase/string-templates": "2.7.25-alpha.2",
-    "@budibase/types": "2.7.25-alpha.2",
+    "@budibase/backend-core": "2.7.25-alpha.3",
+    "@budibase/client": "2.7.25-alpha.3",
+    "@budibase/pro": "2.7.25-alpha.3",
+    "@budibase/shared-core": "2.7.25-alpha.3",
+    "@budibase/string-templates": "2.7.25-alpha.3",
+    "@budibase/types": "2.7.25-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
       }
     }
   },
-  "gitHead": "0dfab0d8a0f3d612f9e33ca58fa3c5f36b87ddca"
+  "gitHead": "1414848c482a1650c4f89e0e933ba5bcba5e79dd"
 }

package/src/api/controllers/application.ts

@@ -115,7 +115,18 @@ function checkAppName(
   }
 }
 
-async function createInstance(appId: string, template: any) {
+interface AppTemplate {
+  templateString: string
+  useTemplate: string
+  file?: {
+    type: string
+    path: string
+    password?: string
+  }
+  key?: string
+}
+
+async function createInstance(appId: string, template: AppTemplate) {
   const db = context.getAppDB()
   await db.put({
     _id: "_design/database",
@@ -240,19 +251,24 @@ export async function fetchAppPackage(ctx: UserCtx) {
 async function performAppCreate(ctx: UserCtx) {
   const apps = (await dbCore.getAllApps({ dev: true })) as App[]
   const name = ctx.request.body.name,
-    possibleUrl = ctx.request.body.url
+    possibleUrl = ctx.request.body.url,
+    encryptionPassword = ctx.request.body.encryptionPassword
+
   checkAppName(ctx, apps, name)
   const url = sdk.applications.getAppUrl({ name, url: possibleUrl })
   checkAppUrl(ctx, apps, url)
 
   const { useTemplate, templateKey, templateString } = ctx.request.body
-  const instanceConfig: any = {
+  const instanceConfig: AppTemplate = {
     useTemplate,
     key: templateKey,
     templateString,
   }
   if (ctx.request.files && ctx.request.files.templateFile) {
-    instanceConfig.file = ctx.request.files.templateFile
+    instanceConfig.file = {
+      ...(ctx.request.files.templateFile as any),
+      password: encryptionPassword,
+    }
   }
   const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null
   const appId = generateDevAppID(generateAppID(tenantId))