Merge branch 'master' into master

7 files changed, 42 insertions, 19 deletions

diff --git a/app/Controllers/Http/DashboardController.js b/app/Controllers/Http/DashboardController.js
index 3de4816..a588c75 100644
--- a/app/Controllers/Http/DashboardController.js
+++ b/app/Controllers/Http/DashboardController.js
@@ -63,7 +63,8 @@ class DashboardController {
     }
     try {
       await Persona.forgotPassword(request.input('mail'));
-    } catch(e) {}
+    // eslint-disable-next-line no-empty
+    } catch (e) {}
 
     return view.render('others.message', {
       heading: 'Reset password',
@@ -91,11 +92,11 @@ class DashboardController {
     const payload = {
       password: crypto.createHash('sha256').update(request.input('password')).digest('base64'),
       password_confirmation: crypto.createHash('sha256').update(request.input('password_confirmation')).digest('base64'),
-    }
+    };
 
     try {
       await Persona.updatePasswordByToken(request.input('token'), payload);
-    } catch(e) {
+    } catch (e) {
       return view.render('others.message', {
         heading: 'Cannot reset your password',
         text: 'Please make sure you are using a valid and recent link to reset your password and that your passwords entered match.',
@@ -122,6 +123,7 @@ class DashboardController {
     return view.render('dashboard.account', {
       username: auth.user.username,
       email: auth.user.email,
+      lastname: auth.user.lastname,
     });
   }
 
@@ -135,6 +137,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 +171,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 +196,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 +216,7 @@ class DashboardController {
 
     const exportData = {
       username: general.username,
+      lastname: general.lastname,
       mail: general.email,
       services,
       workspaces,
diff --git a/app/Controllers/Http/ServiceController.js b/app/Controllers/Http/ServiceController.js
index a1d26cb..4aa611c 100644
--- a/app/Controllers/Http/ServiceController.js
+++ b/app/Controllers/Http/ServiceController.js
@@ -140,7 +140,9 @@ class ServiceController {
       let iconId;
       do {
         iconId = uuid() + uuid();
+      // eslint-disable-next-line no-await-in-loop
       } while (await fs.exists(path.join(Helpers.tmpPath('uploads'), iconId)));
+      iconId = `${iconId}.${icon.extname}`;
 
       await icon.move(Helpers.tmpPath('uploads'), {
         name: iconId,
diff --git a/app/Controllers/Http/StaticController.js b/app/Controllers/Http/StaticController.js
index d1a1179..114e369 100644
--- a/app/Controllers/Http/StaticController.js
+++ b/app/Controllers/Http/StaticController.js
@@ -34,7 +34,6 @@ class StaticController {
       defaultTrialPlan: 'franz-pro-yearly',
       subscribeURL: 'https://getferdi.com',
       planSelectionURL: 'https://getferdi.com',
-      isMagicBarEnabled: true,
       hasInlineCheckout: true,
       isPlanSelectionEnabled: false,
       isTrialStatusBarEnabled: false,
@@ -101,9 +100,11 @@ class StaticController {
   }) {
     return response.send(
       fs
-      .readJsonSync(path.join(
-        Helpers.appRoot(), "officialrecipes", "recipes", "all.json"))
-      .filter((recipe) => recipe.featured));
+        .readJsonSync(path.join(
+          Helpers.appRoot(), 'officialrecipes', 'recipes', 'all.json',
+        ))
+        .filter((recipe) => recipe.featured),
+    );
   }
 
   // Show announcements
diff --git a/app/Controllers/Http/UserController.js b/app/Controllers/Http/UserController.js
index e367d99..0d768a9 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 || {},
     });
   }
 
@@ -174,6 +177,7 @@ class UserController {
       ...request.all(),
     };
 
+    // eslint-disable-next-line no-param-reassign
     auth.user.settings = JSON.stringify(newSettings);
     await auth.user.save();
 
@@ -185,13 +189,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 +250,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.');
@@ -258,12 +263,19 @@ class UserController {
     let token;
     try {
       const basicToken = btoa(`${email}:${hashedPassword}`);
+      const loginBody = {
+        isZendeskLogin: false,
+      };
 
       const rawResponse = await fetch(`${base}auth/login`, {
         method: 'POST',
+        body: JSON.stringify(loginBody),
         headers: {
           Authorization: `Basic ${basicToken}`,
           'User-Agent': userAgent,
+          'Content-Type': 'application/json',
+          accept: '*/*',
+          'x-franz-source': 'Web',
         },
       });
       const content = await rawResponse.json();
@@ -301,6 +313,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}`;
diff --git a/app/Controllers/Http/WorkspaceController.js b/app/Controllers/Http/WorkspaceController.js
index cbb6873..496912e 100644
--- a/app/Controllers/Http/WorkspaceController.js
+++ b/app/Controllers/Http/WorkspaceController.js
@@ -112,7 +112,8 @@ class WorkspaceController {
   }
 
   async delete({
-    request,
+    // eslint-disable-next-line no-unused-vars
+    _request,
     response,
     auth,
     params,
diff --git a/app/Middleware/HandleDoubleSlash.js b/app/Middleware/HandleDoubleSlash.js
index 456b774..c4bc053 100644
--- a/app/Middleware/HandleDoubleSlash.js
+++ b/app/Middleware/HandleDoubleSlash.js
@@ -1,4 +1,3 @@
-'use strict'
 /** @typedef {import('@adonisjs/framework/src/Request')} Request */
 /** @typedef {import('@adonisjs/framework/src/Response')} Response */
 /** @typedef {import('@adonisjs/framework/src/View')} View */
@@ -9,7 +8,8 @@ class HandleDoubleSlash {
    * @param {Request} ctx.request
    * @param {Function} next
    */
-  async handle ({ request, response }, next) {
+  // eslint-disable-next-line consistent-return
+  async handle({ request, response }, next) {
     // Redirect requests that contain duplicate slashes to the right path
     if (request.url().includes('//')) {
       return response.redirect(
@@ -21,4 +21,4 @@ class HandleDoubleSlash {
   }
 }
 
-module.exports = HandleDoubleSlash
+module.exports = HandleDoubleSlash;
diff --git a/app/Models/Token.js b/app/Models/Token.js
index 50bcf1d..4a6c286 100644
--- a/app/Models/Token.js
+++ b/app/Models/Token.js
@@ -4,7 +4,7 @@ const Model = use('Model');
 
 class Token extends Model {
   user() {
-    return this.belongsTo('App/Models/User')
+    return this.belongsTo('App/Models/User');
   }
 }