diff options
author | Amine El Mouafik <412895+kytwb@users.noreply.github.com> | 2021-02-07 10:58:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-07 10:58:00 +0100 |
commit | 9b8c614bbb3341fa26ecaa5fdec1a23629c92eb1 (patch) | |
tree | 37829eb685cf8f4e12a6fdd3a4bdbefaccc94f50 /app/Controllers/Http/DashboardController.js | |
parent | Merge pull request #47 from cromefire/db-path (diff) | |
parent | Fix regarding CR comments - username should be added to user and not to works... (diff) | |
download | ferdium-server-9b8c614bbb3341fa26ecaa5fdec1a23629c92eb1.tar.gz ferdium-server-9b8c614bbb3341fa26ecaa5fdec1a23629c92eb1.tar.zst ferdium-server-9b8c614bbb3341fa26ecaa5fdec1a23629c92eb1.zip |
Merge pull request #50 from k0staa/bug/account_settings_display_franz_fix
Diffstat (limited to 'app/Controllers/Http/DashboardController.js')
-rw-r--r-- | app/Controllers/Http/DashboardController.js | 5 |
1 files changed, 5 insertions, 0 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 { | |||
122 | return view.render('dashboard.account', { | 122 | return view.render('dashboard.account', { |
123 | username: auth.user.username, | 123 | username: auth.user.username, |
124 | email: auth.user.email, | 124 | email: auth.user.email, |
125 | lastname: auth.user.lastname | ||
125 | }); | 126 | }); |
126 | } | 127 | } |
127 | 128 | ||
@@ -135,6 +136,7 @@ class DashboardController { | |||
135 | let validation = await validateAll(request.all(), { | 136 | let validation = await validateAll(request.all(), { |
136 | username: 'required', | 137 | username: 'required', |
137 | email: 'required', | 138 | email: 'required', |
139 | lastname: 'required' | ||
138 | }); | 140 | }); |
139 | if (validation.fails()) { | 141 | if (validation.fails()) { |
140 | session.withErrors(validation.messages()).flashExcept(['password']); | 142 | session.withErrors(validation.messages()).flashExcept(['password']); |
@@ -168,6 +170,7 @@ class DashboardController { | |||
168 | // Update user account | 170 | // Update user account |
169 | const { user } = auth; | 171 | const { user } = auth; |
170 | user.username = request.input('username'); | 172 | user.username = request.input('username'); |
173 | user.lastname = request.input('lastname'); | ||
171 | user.email = request.input('email'); | 174 | user.email = request.input('email'); |
172 | if (request.input('password')) { | 175 | if (request.input('password')) { |
173 | const hashedPassword = crypto.createHash('sha256').update(request.input('password')).digest('base64'); | 176 | const hashedPassword = crypto.createHash('sha256').update(request.input('password')).digest('base64'); |
@@ -192,6 +195,7 @@ class DashboardController { | |||
192 | 195 | ||
193 | return view.render('dashboard.data', { | 196 | return view.render('dashboard.data', { |
194 | username: general.username, | 197 | username: general.username, |
198 | lastname: general.lastname, | ||
195 | mail: general.email, | 199 | mail: general.email, |
196 | created: general.created_at, | 200 | created: general.created_at, |
197 | updated: general.updated_at, | 201 | updated: general.updated_at, |
@@ -211,6 +215,7 @@ class DashboardController { | |||
211 | 215 | ||
212 | const exportData = { | 216 | const exportData = { |
213 | username: general.username, | 217 | username: general.username, |
218 | lastname: general.lastname, | ||
214 | mail: general.email, | 219 | mail: general.email, |
215 | services, | 220 | services, |
216 | workspaces, | 221 | workspaces, |