Automatically redirect to requested page after login

Author: TiTi

back/app_flask.py

@@ -116,7 +116,7 @@ def should_be_connected(message):
   if request.path.startswith('/api'):
     return {'message': 'Authentication failed: '+message}, 401
 
-  response = make_response(redirect('/login'))
+  response = make_response(redirect('/login?'+urllib.parse.urlencode({'dest': request.path})))
   unset_jwt_cookies(response)
   return response
 
@@ -307,13 +307,20 @@ def login():
       # something other than 'session'
       # this sets 1 year in the future, but jwt expiration prevails
       app.config['JWT_SESSION_COOKIE'] = False
+
     token = LoginAPI.authenticate(
       form['login'],
       form['password'],
       expires
     )
+
+    requestedPage = '/'
+    referrerParams = urllib.parse.parse_qs(urllib.parse.urlparse(request.referrer).query)
+    if 'dest' in referrerParams:
+      requestedPage = referrerParams['dest'][0]
+
     if token not in [None, 'expired']:
-      response = make_response(redirect('/'))
+      response = make_response(redirect(requestedPage))
       set_access_cookies(response, token)
       return response
     else:
@@ -322,7 +329,7 @@ def login():
         default_theme=settings.default_theme), 401
   elif get_jwt_identity() is not None:
     # Already connected
-    return redirect('/')
+    return redirect(requestedPage)
   # GET
   return render_template('login.html', **lang,
     default_theme=settings.default_theme)

front/src/event_comments.ts

@@ -23,7 +23,7 @@ export default function loadComments (event: CurrentEvent): void
 	};
 	var event_comment_avatar = id("event_comment_avatar");
 	Object.keys(attributes).forEach(attr =>
-		event_comment_avatar.setAttribute(attr, (attributes[attr] as string|number).toString()));
+		event_comment_avatar.setAttribute(attr, (attributes[attr as keyof typeof attributes] as string|number).toString()));
 
 	var event_comments = id('event_comments');
 	event_comments.innerHTML = '<div class="spinner-border m-auto" role="status"></div>';
@@ -39,7 +39,7 @@ export default function loadComments (event: CurrentEvent): void
 	},
 	function (type: string, ex: XMLHttpRequest)
 	{
-		CheckAuthentication(ex);
+		CheckAuthentication(ex, event.event_id);
 
 		event_comments.innerHTML = ''; // Remove spinner
 		console.error(type, ex.responseText);
@@ -51,11 +51,11 @@ export default function loadComments (event: CurrentEvent): void
 	});
 }
 
-function CheckAuthentication (ex: XMLHttpRequest)
+function CheckAuthentication (ex: XMLHttpRequest, event_id: number)
 {
 	if (ex.status === 401)
 	{
-		window.location.assign('/login');
+		window.location.assign('/login?dest='+encodeURIComponent('/event:'+event_id));
 	}
 }
 
@@ -306,7 +306,7 @@ function registerToEvent (event_id: number, interest: number, button_id: string,
 	},
 	function (type: string, ex: XMLHttpRequest)
 	{
-		CheckAuthentication(ex);
+		CheckAuthentication(ex, event_id);
 		console.error(type, ex);
 	});
 }
@@ -320,7 +320,7 @@ function unregisterFromEvent (event_id: number, button_id: string, container: HT
 	},
 	function (type: string, ex: XMLHttpRequest)
 	{
-		CheckAuthentication(ex);
+		CheckAuthentication(ex, event_id);
 		console.error(type, ex);
 	});
 }

front/src/event_plan.ts

@@ -104,7 +104,7 @@ export function planAnEvent (start_date: Date, end_date: Date, editedEvent?: Eve
 {
 	if (!get_connected_user())
 	{
-		window.location.assign('/login');
+		window.location.assign('/login'); // ?dest='+encodeURIComponent('/event:new')  potential bad date thus commented out
 		return;
 	}
 
@@ -333,7 +333,7 @@ function SubmitEvent (onCreate: (event: EventInput) => void)
 		{
 			if (ex.status === 401)
 			{
-				window.location.assign('/login');
+				window.location.assign('/login'); // ?dest='+encodeURIComponent('/event:new')  potential bad date thus commented out
 			}
 			else if (ex.status === 400)
 			{

front/src/event_show.ts

@@ -114,7 +114,7 @@ export function showEvent (calEvent: EventApi): void
 	var connected_user: ConnectedUser = get_connected_user();
 	if (!connected_user)
 	{
-		window.location.assign('/login');
+		window.location.assign('/login?dest='+encodeURIComponent('/event:'+calEvent.id));
 		return;
 	}
 
@@ -505,7 +505,7 @@ function SubmitComment ()
 		{
 			if (ex.status === 401)
 			{
-				window.location.assign('/login');
+				window.location.assign('/login?dest='+encodeURIComponent('/event:'+current_event.event_id));
 			}
 			console.error(type, ex.responseText)
 			comment_post_error.innerHTML = i18n('Unable to save');

last_release.md

@@ -1 +1 @@
-* Fix previous_role
+* Automatically redirect to requested page after login