From 29b8334b060dc0c05a509d523ead4b3a30229fef Mon Sep 17 00:00:00 2001 From: vantezzen Date: Thu, 5 Sep 2019 11:22:49 +0200 Subject: Add eslint --- app/Controllers/Http/DashboardController.js | 61 +++++++++++++++-------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'app/Controllers/Http/DashboardController.js') diff --git a/app/Controllers/Http/DashboardController.js b/app/Controllers/Http/DashboardController.js index aa8127f..49f6cc0 100644 --- a/app/Controllers/Http/DashboardController.js +++ b/app/Controllers/Http/DashboardController.js @@ -1,7 +1,6 @@ -'use strict' const { - validateAll + validateAll, } = use('Validator'); const crypto = require('crypto'); @@ -11,7 +10,7 @@ class DashboardController { request, response, auth, - session + session, }) { const validation = await validateAll(request.all(), { mail: 'required|email', @@ -20,25 +19,25 @@ class DashboardController { if (validation.fails()) { session.withErrors({ type: 'danger', - message: 'Invalid mail or password' + message: 'Invalid mail or password', }).flashExcept(['password']); return response.redirect('back'); } - let { + const { mail, - password - } = request.all() + password, + } = request.all(); const hashedPassword = crypto.createHash('sha256').update(password).digest('base64'); try { - await auth.authenticator('session').attempt(mail, hashedPassword) + await auth.authenticator('session').attempt(mail, hashedPassword); } catch (error) { session.flash({ type: 'danger', - message: 'Invalid mail or password' - }) + message: 'Invalid mail or password', + }); return response.redirect('back'); } return response.redirect('/user/account'); @@ -46,17 +45,18 @@ class DashboardController { async account({ auth, - view + view, + response, }) { try { - await auth.check() + await auth.check(); } catch (error) { return response.redirect('/user/login'); } return view.render('dashboard.account', { username: auth.user.username, - email: auth.user.email + email: auth.user.email, }); } @@ -65,11 +65,11 @@ class DashboardController { request, session, view, - response + response, }) { let validation = await validateAll(request.all(), { username: 'required', - email: 'required' + email: 'required', }); if (validation.fails()) { session.withErrors(validation.messages()).flashExcept(['password']); @@ -80,19 +80,19 @@ class DashboardController { if (request.input('username') !== auth.user.username) { validation = await validateAll(request.all(), { username: 'required|unique:users,username', - email: 'required' + email: 'required', }); if (validation.fails()) { session.withErrors(validation.messages()).flashExcept(['password']); return response.redirect('back'); } - } + } // Check new email if (request.input('email') !== auth.user.email) { validation = await validateAll(request.all(), { username: 'required', - email: 'required|email|unique:users,email' + email: 'required|email|unique:users,email', }); if (validation.fails()) { session.withErrors(validation.messages()).flashExcept(['password']); @@ -101,24 +101,25 @@ class DashboardController { } // Update user account - auth.user.username = request.input('username'); - auth.user.email = request.input('email'); - if (!!request.input('password')) { + const { user } = auth; + user.username = request.input('username'); + user.email = request.input('email'); + if (request.input('password')) { const hashedPassword = crypto.createHash('sha256').update(request.input('password')).digest('base64'); - auth.user.password = hashedPassword; + user.password = hashedPassword; } - auth.user.save(); + user.save(); return view.render('dashboard.account', { - username: auth.user.username, - email: auth.user.email, - success: true + username: user.username, + email: user.email, + success: true, }); } async data({ auth, - view + view, }) { const general = auth.user; const services = (await auth.user.services().fetch()).toJSON(); @@ -136,7 +137,7 @@ class DashboardController { logout({ auth, - response + response, }) { auth.authenticator('session').logout(); return response.redirect('/user/login'); @@ -144,7 +145,7 @@ class DashboardController { delete({ auth, - response + response, }) { auth.user.delete(); auth.authenticator('session').logout(); @@ -152,4 +153,4 @@ class DashboardController { } } -module.exports = DashboardController +module.exports = DashboardController; -- cgit v1.2.3-70-g09d2