diff options
Diffstat (limited to 'start')
-rw-r--r-- | start/events.js | 14 | ||||
-rw-r--r-- | start/routes.js | 25 |
2 files changed, 20 insertions, 19 deletions
diff --git a/start/events.js b/start/events.js index 1e4ed5f..c4076cc 100644 --- a/start/events.js +++ b/start/events.js | |||
@@ -12,12 +12,14 @@ ${Env.get('APP_URL')}/user/reset?token=${encodeURIComponent(token)} | |||
12 | 12 | ||
13 | This message was sent automatically. Please do not reply. | 13 | This message was sent automatically. Please do not reply. |
14 | `; | 14 | `; |
15 | console.log('Sending message', body); | 15 | console.log('Sending message', body); |
16 | try { | 16 | try { |
17 | await Mail.raw(body, (message) => { | 17 | await Mail.raw(body, (message) => { |
18 | message.subject('[Ferdi] Reset your password') | 18 | message.subject('[Ferdi] Reset your password'); |
19 | message.from(Env.get('MAIL_SENDER')) | 19 | message.from(Env.get('MAIL_SENDER')); |
20 | message.to(user.email) | 20 | message.to(user.email); |
21 | }); | 21 | }); |
22 | } catch(e) {} | 22 | } catch (e) { |
23 | }); \ No newline at end of file | 23 | console.log(`Couldn't send mail: ${e}`); |
24 | } | ||
25 | }); | ||
diff --git a/start/routes.js b/start/routes.js index 1c2d4f3..05bc538 100644 --- a/start/routes.js +++ b/start/routes.js | |||
@@ -60,26 +60,25 @@ Route.group(() => { | |||
60 | }).prefix('v1'); | 60 | }).prefix('v1'); |
61 | 61 | ||
62 | // User dashboard | 62 | // User dashboard |
63 | if (Env.get('IS_DASHBOARD_ENABLED') != 'false') { | 63 | if (Env.get('IS_DASHBOARD_ENABLED') !== 'false') { |
64 | Route.group(() => { | 64 | Route.group(() => { |
65 | // Auth | 65 | // Auth |
66 | Route.get('login', ({ view }) => view.render('dashboard.login')).middleware('guest'); | 66 | Route.get('login', ({ view }) => view.render('dashboard.login')).middleware('guest'); |
67 | Route.post('login', 'DashboardController.login').middleware('guest').as('login'); | 67 | Route.post('login', 'DashboardController.login').middleware('guest').as('login'); |
68 | 68 | ||
69 | // Reset password | 69 | // Reset password |
70 | Route.get('forgot', ({ view }) => view.render('dashboard.forgotPassword')).middleware('guest'); | 70 | Route.get('forgot', ({ view }) => view.render('dashboard.forgotPassword')).middleware('guest'); |
71 | Route.post('forgot', 'DashboardController.forgotPassword').middleware('guest'); | 71 | Route.post('forgot', 'DashboardController.forgotPassword').middleware('guest'); |
72 | 72 | ||
73 | Route.get('reset', ({ view, request }) => { | 73 | Route.get('reset', ({ view, request }) => { |
74 | const token = request.get().token; | 74 | const { token } = request.get(); |
75 | if (token) { | 75 | if (token) { |
76 | return view.render('dashboard.resetPassword', { token }) | 76 | return view.render('dashboard.resetPassword', { token }); |
77 | } else { | ||
78 | return view.render('others.message', { | ||
79 | heading: 'Invalid token', | ||
80 | text: 'Please make sure you are using a valid and recent link to reset your password.', | ||
81 | }); | ||
82 | } | 77 | } |
78 | return view.render('others.message', { | ||
79 | heading: 'Invalid token', | ||
80 | text: 'Please make sure you are using a valid and recent link to reset your password.', | ||
81 | }); | ||
83 | }).middleware('guest'); | 82 | }).middleware('guest'); |
84 | Route.post('reset', 'DashboardController.resetPassword').middleware('guest'); | 83 | Route.post('reset', 'DashboardController.resetPassword').middleware('guest'); |
85 | 84 | ||
@@ -92,19 +91,19 @@ if (Env.get('IS_DASHBOARD_ENABLED') != 'false') { | |||
92 | Route.get('export', 'DashboardController.export').middleware('auth:session'); | 91 | Route.get('export', 'DashboardController.export').middleware('auth:session'); |
93 | Route.post('transfer', 'DashboardController.import').middleware('auth:session'); | 92 | Route.post('transfer', 'DashboardController.import').middleware('auth:session'); |
94 | Route.get('transfer', ({ view }) => view.render('dashboard.transfer')).middleware('auth:session'); | 93 | Route.get('transfer', ({ view }) => view.render('dashboard.transfer')).middleware('auth:session'); |
95 | 94 | ||
96 | Route.get('delete', ({ view }) => view.render('dashboard.delete')).middleware('auth:session'); | 95 | Route.get('delete', ({ view }) => view.render('dashboard.delete')).middleware('auth:session'); |
97 | Route.post('delete', 'DashboardController.delete').middleware('auth:session'); | 96 | Route.post('delete', 'DashboardController.delete').middleware('auth:session'); |
98 | 97 | ||
99 | Route.get('logout', 'DashboardController.logout').middleware('auth:session'); | 98 | Route.get('logout', 'DashboardController.logout').middleware('auth:session'); |
100 | 99 | ||
101 | Route.get('*', ({ response }) => response.redirect('/user/account')); | 100 | Route.get('*', ({ response }) => response.redirect('/user/account')); |
102 | }).prefix('user').middleware('shield'); | 101 | }).prefix('user').middleware('shield'); |
103 | } else { | 102 | } else { |
104 | Route.group(() => { | 103 | Route.group(() => { |
105 | Route.get('*', ({ | 104 | Route.get('*', ({ |
106 | response, | 105 | response, |
107 | }) => response.send('The user dashboard is disabled on this server\n\nIf you are the server owner, please set IS_DASHBOARD_ENABLED to true to enable the dashboard.')) | 106 | }) => response.send('The user dashboard is disabled on this server\n\nIf you are the server owner, please set IS_DASHBOARD_ENABLED to true to enable the dashboard.')); |
108 | }).prefix('user'); | 107 | }).prefix('user'); |
109 | } | 108 | } |
110 | 109 | ||