Skip to content

Commit d3d5864

Browse files
committed
feat: redirect to reports page if an authenticated user go to login page
1 parent 608d985 commit d3d5864

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

src/wwwroot/app.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@
259259
$rootScope.$on('$locationChangeStart', function (event, next, current) {
260260
var nextRelativeUrl = (next && next.split('#')[1]) || '/';
261261
var forceLogoutUrls = [
262-
'/login',
263262
'/signup/registration',
264263
'/signup/otp-validation',
265264
'/signup/succeed',
@@ -271,7 +270,6 @@
271270
}
272271

273272
var unauthenticatedAllowed = [
274-
'/login',
275273
'/signup/registration',
276274
'/signup/otp-validation',
277275
'/signup/confirmation',
@@ -340,7 +338,8 @@
340338

341339
function verifyAuthorization($location, auth) {
342340
var openForAllUrls = ['/signup/error', '/temporal-token-error', '/dkim-configuration-tutorial'];
343-
var requireLogoutUrls = ['/signup/confirmation', '/login', '/signup/registration', '/signup/otp-validation', '/signup/succeed', '/loginAdmin'];
341+
var requireLogoutUrls = ['/signup/confirmation', '/signup/registration', '/signup/otp-validation', '/signup/succeed', '/loginAdmin'];
342+
var redirectIfAuthedUrls = ['/login'];
344343
var requireTemporalAuthUrls = ['/reset-password', '/change-email'];
345344

346345
// TODO: optimize it
@@ -349,8 +348,9 @@
349348
var userIsAuthedTemporarily = userIsAuthed && auth.isTemporarilyAuthed();
350349
var pageOpenForAll = openForAllUrls.includes(currentPath);
351350
var pageRequireLogout = requireLogoutUrls.includes(currentPath);
351+
var pageRedirectIfAuthed = redirectIfAuthedUrls.includes(currentPath);
352352
var pageRequireTemporalAuth = requireTemporalAuthUrls.includes(currentPath);
353-
353+
354354
if(!auth.isUrlAllowed(currentPath)) {
355355
$location.path(auth.getDefaultUrl() || '/login');
356356
}
@@ -366,6 +366,18 @@
366366
return;
367367
}
368368

369+
if (pageRedirectIfAuthed) {
370+
if (userIsAuthedTemporarily) {
371+
auth.logOut();
372+
return;
373+
}
374+
if (userIsAuthed) {
375+
$location.path(auth.getDefaultUrl() || '/reports');
376+
return;
377+
}
378+
return;
379+
}
380+
369381
if (pageRequireTemporalAuth && !userIsAuthedTemporarily) {
370382
$location.path('/temporal-token-error');
371383
return;

0 commit comments

Comments
 (0)