Add lastname column to User DB table and update API logic to save,return and update this data.

2 files changed, 17 insertions, 7 deletions

diff --git a/app/Controllers/Http/DashboardController.js b/app/Controllers/Http/DashboardController.js
index 3de4816..2f06961 100644
--- a/app/Controllers/Http/DashboardController.js
+++ b/app/Controllers/Http/DashboardController.js
@@ -122,6 +122,7 @@ class DashboardController {
     return view.render('dashboard.account', {
       username: auth.user.username,
       email: auth.user.email,
+      lastname: auth.user.lastname
     });
   }
 
@@ -135,6 +136,7 @@ class DashboardController {
     let validation = await validateAll(request.all(), {
       username: 'required',
       email: 'required',
+      lastname: 'required'
     });
     if (validation.fails()) {
       session.withErrors(validation.messages()).flashExcept(['password']);
@@ -168,6 +170,7 @@ class DashboardController {
     // Update user account
     const { user } = auth;
     user.username = request.input('username');
+    user.lastname = request.input('lastname');
     user.email = request.input('email');
     if (request.input('password')) {
       const hashedPassword = crypto.createHash('sha256').update(request.input('password')).digest('base64');
@@ -192,6 +195,7 @@ class DashboardController {
 
     return view.render('dashboard.data', {
       username: general.username,
+      lastname: general.lastname,
       mail: general.email,
       created: general.created_at,
       updated: general.updated_at,
@@ -211,6 +215,7 @@ class DashboardController {
 
     const exportData = {
       username: general.username,
+      lastname: general.lastname,
       mail: general.email,
       services,
       workspaces,
diff --git a/app/Controllers/Http/UserController.js b/app/Controllers/Http/UserController.js
index e367d99..dc92b21 100644
--- a/app/Controllers/Http/UserController.js
+++ b/app/Controllers/Http/UserController.js
@@ -48,9 +48,11 @@ class UserController {
     // Validate user input
     const validation = await validateAll(request.all(), {
       firstname: 'required',
+      lastname: 'required',
       email: 'required|email|unique:users,email',
       password: 'required',
     });
+
     if (validation.fails()) {
       return response.status(401).send({
         message: 'Invalid POST arguments',
@@ -59,7 +61,7 @@ class UserController {
       });
     }
 
-    const data = request.only(['firstname', 'email', 'password']);
+    const data = request.only(['firstname', 'lastname', 'email', 'password']);
 
     // Create user in DB
     let user;
@@ -68,6 +70,7 @@ class UserController {
         email: data.email,
         password: data.password,
         username: data.firstname,
+        lastname: data.lastname,
       });
     } catch (e) {
       return response.status(401).send({
@@ -149,13 +152,13 @@ class UserController {
       email: auth.user.email,
       emailValidated: true,
       features: {},
-      firstname: 'Franz',
+      firstname: auth.user.username,
       id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
       isPremium: true,
       isSubscriptionOwner: true,
-      lastname: 'Franz',
+      lastname: auth.user.lastname,
       locale: 'en-US',
-      ...settings || {},
+      ...settings || {},
     });
   }
 
@@ -185,13 +188,13 @@ class UserController {
         email: auth.user.email,
         emailValidated: true,
         features: {},
-        firstname: 'Franz',
+        firstname: auth.user.username,
         id: '82c1cf9d-ab58-4da2-b55e-aaa41d2142d8',
         isPremium: true,
         isSubscriptionOwner: true,
-        lastname: 'Franz',
+        lastname: auth.user.lastname,
         locale: 'en-US',
-        ...newSettings || {},
+        ...newSettings || {},
       },
       status: [
         'data-updated',
@@ -246,6 +249,7 @@ class UserController {
         email,
         password: hashedPassword,
         username: 'Franz',
+        lastname: 'Franz'
       });
 
       return response.send('Your account has been created but due to this server\'s configuration, we could not import your Franz account data.\n\nIf you are the server owner, please set CONNECT_WITH_FRANZ to true to enable account imports.');
@@ -301,6 +305,7 @@ class UserController {
         email: userInf.email,
         password: hashedPassword,
         username: userInf.firstname,
+        lastname: userInf.lastname
       });
     } catch (e) {
       const errorMessage = `Could not create your user in our system.\nError: ${e}`;