From 7ef4f2b2ac06e46b91711454b955d2ceb0978432 Mon Sep 17 00:00:00 2001
From: kevmodrome <kevin@kevmodro.me>
Date: Mon, 3 Aug 2020 16:26:28 +0200
Subject: [PATCH] signup flow now works correctly

---
 .../src/components/start/AppCard.svelte       |  6 +--
 .../components/start/CreateAppModal.svelte    | 38 +++++++++++++++----
 .../src/components/start/Steps/index.js       |  6 +--
 .../server/src/api/controllers/application.js |  1 -
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index 7cee45104a..39ee948b98 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -1,14 +1,10 @@
 <script>
   import Button from "components/common/Button.svelte"
-  export let name,
-    description = `A minimalist CRM which removes the noise and allows you to focus
-              on your business.`,
-    _id
+  export let name, _id
 </script>
 
 <div class="apps-card">
   <h3 class="app-title">{name}</h3>
-  <p class="app-desc">{description}</p>
   <div class="card-footer">
     <a href={`/_builder/${_id}`} class="app-button">Open {name}</a>
   </div>
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index cb97209b28..755ed358a5 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -6,8 +6,9 @@
 </script>
 
 <script>
+  import { store, workflowStore, backendUiStore } from "builderStore"
   import { string, object } from "yup"
-  import api from "builderStore/api"
+  import api, { get } from "builderStore/api"
   import Form from "@svelteschool/svelte-forms"
   import Spinner from "components/common/Spinner.svelte"
   import { API, Info, User } from "./Steps"
@@ -114,27 +115,48 @@
   async function signUp() {
     submitting = true
     try {
+      // Add API key if there is none.
       if (!hasKey) {
         await updateKey(["budibase", $createAppStore.values.apiKey])
       }
-      const response = await post("/api/applications", {
+
+      // Create App
+      const appResp = await post("/api/applications", {
         name: $createAppStore.values.applicationName,
       })
-      const res = await response.json()
+      const appJson = await appResp.json()
       analytics.captureEvent("web_app_created", {
         name,
-        description,
-        appId: res._id,
+        appId: appJson._id,
       })
-      console.log("App created!")
-      // $goto(`./${res._id}`)
+
+      // Select Correct Application/DB in prep for creating user
+      const applicationPkg = await get(`/api/${appJson._id}/appPackage`)
+      const pkg = await applicationPkg.json()
+      if (applicationPkg.ok) {
+        backendUiStore.actions.reset()
+        await store.setPackage(pkg)
+        workflowStore.actions.fetch()
+      } else {
+        throw new Error(pkg)
+      }
+
+      // Create user
+      const user = {
+        name: $createAppStore.values.username,
+        username: $createAppStore.values.username,
+        password: $createAppStore.values.password,
+        accessLevelId: $createAppStore.values.accessLevelId,
+      }
+      const userResp = await api.post(`/api/users`, user)
+      const json = await userResp.json()
+      $goto(`./${appJson._id}`)
     } catch (error) {
       console.error(error)
     }
   }
 
   async function updateKey([key, value]) {
-    console.log("Saving API Key")
     const response = await api.put(`/api/keys/${key}`, { value })
     const res = await response.json()
     return res
diff --git a/packages/builder/src/components/start/Steps/index.js b/packages/builder/src/components/start/Steps/index.js
index 45b9a7649c..e59018eda7 100644
--- a/packages/builder/src/components/start/Steps/index.js
+++ b/packages/builder/src/components/start/Steps/index.js
@@ -1,3 +1,3 @@
-export { default as API } from './API.svelte'
-export { default as Info } from './Info.svelte'
-export { default as User } from './User.svelte'
\ No newline at end of file
+export { default as API } from "./API.svelte"
+export { default as Info } from "./Info.svelte"
+export { default as User } from "./User.svelte"
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index fcc3bc0579..9619a973c9 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -69,7 +69,6 @@ exports.create = async function(ctx) {
       "@budibase/materialdesign-components",
     ],
     name: ctx.request.body.name,
-    description: ctx.request.body.description,
   }
 
   const { rev } = await db.put(newApplication)