Can redirect user on successful login

Cargo.lock

@@ -395,6 +395,7 @@ dependencies = [
  "mime_guess",
  "serde",
  "serde_json",
+ "urlencoding",
  "uuid",
 ]
 
@@ -1625,6 +1626,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821"
+
 [[package]]
 name = "uuid"
 version = "0.8.2"

Cargo.toml

@@ -19,4 +19,5 @@ bcrypt = "0.12.1"
 uuid = { version = "0.8.2", features = ["v4"] }
 mime_guess = "2.0.4"
 askama = "0.11.1"
-futures-util = "0.3.21"
+futures-util = "0.3.21"
+urlencoding = "2.1.0"

src/controllers/base_controller.rs

@@ -1,8 +1,22 @@
+use std::fmt::Display;
+
 use actix_web::HttpResponse;
 
+use crate::constants::LOGIN_ROUTE;
+
 /// Create a redirect user response
 pub fn redirect_user(uri: &str) -> HttpResponse {
     HttpResponse::Found()
         .append_header(("Location", uri))
         .finish()
-}
+}
+
+/// Redirect user to authenticate him
+pub fn redirect_user_for_login<P: Display>(redirect_uri: P) -> HttpResponse {
+    HttpResponse::Found()
+        .append_header((
+            "Location",
+            format!("{}?redirect={}", LOGIN_ROUTE, urlencoding::encode(&redirect_uri.to_string()))
+        ))
+        .finish()
+}

src/controllers/login_controller.rs

@@ -16,6 +16,7 @@ struct BaseLoginPage {
     success: String,
     page_title: &'static str,
     app_name: &'static str,
+    redirect_uri: String,
 }
 
 #[derive(Template)]
@@ -41,6 +42,7 @@ pub struct LoginRequestBody {
 #[derive(serde::Deserialize)]
 pub struct LoginRequestQuery {
     logout: Option<bool>,
+    redirect: Option<String>,
 }
 
 /// Authenticate user
@@ -52,6 +54,14 @@ pub async fn login_route(users: web::Data<Addr<UsersActor>>,
     let mut success = String::new();
     let mut login = String::new();
 
+    let redirect_uri = match query.redirect.as_deref() {
+        None => "/",
+        Some(s) => match s.starts_with('/') && !s.starts_with("//") {
+            true => s,
+            false => "/",
+        }
+    };
+
     // Check if user session must be closed
     if let Some(true) = query.logout {
         id.forget();
@@ -60,7 +70,7 @@ pub async fn login_route(users: web::Data<Addr<UsersActor>>,
 
     // Check if user is already authenticated
     if SessionIdentity(&id).is_authenticated() {
-        return redirect_user("/");
+        return redirect_user(redirect_uri);
     }
 
     // Check if user is setting a new  password
@@ -78,7 +88,7 @@ pub async fn login_route(users: web::Data<Addr<UsersActor>>,
                 danger = "Failed to change password!".to_string();
             } else {
                 SessionIdentity(&id).set_status(SessionStatus::SignedIn);
-                return redirect_user("/");
+                return redirect_user(redirect_uri);
             }
         }
     }
@@ -100,7 +110,7 @@ pub async fn login_route(users: web::Data<Addr<UsersActor>>,
                 if user.need_reset_password {
                     SessionIdentity(&id).set_status(SessionStatus::NeedNewPassword);
                 } else {
-                    return redirect_user("/");
+                    return redirect_user(redirect_uri);
                 }
             }
 
@@ -122,6 +132,7 @@ pub async fn login_route(users: web::Data<Addr<UsersActor>>,
                     danger,
                     success,
                     app_name: APP_NAME,
+                    redirect_uri: urlencoding::encode(redirect_uri).to_string(),
                 },
                 min_pass_len: MIN_PASS_LEN,
             }.render().unwrap());
@@ -136,6 +147,7 @@ pub async fn login_route(users: web::Data<Addr<UsersActor>>,
                 danger,
                 success,
                 app_name: APP_NAME,
+                redirect_uri: urlencoding::encode(redirect_uri).to_string(),
             },
             login,
         }.render().unwrap())

src/middlewares/auth_middleware.rs

@@ -9,8 +9,8 @@ use actix_web::{dev::{forward_ready, Service, ServiceRequest, ServiceResponse, T
 use actix_web::body::EitherBody;
 use askama::Template;
 
-use crate::constants::{ADMIN_ROUTES, AUTHENTICATED_ROUTES, LOGIN_ROUTE};
+use crate::constants::{ADMIN_ROUTES, AUTHENTICATED_ROUTES};
-use crate::controllers::base_controller::redirect_user;
+use crate::controllers::base_controller::redirect_user_for_login;
 use crate::data::session_identity::{SessionIdentity, SessionIdentityData};
 
 // There are two steps in middleware processing.
@@ -100,7 +100,8 @@ impl<S, B> Service<ServiceRequest> for AuthInnerMiddleware<S>
             // Redirect user to login page
             if !identity.is_auth() && (req.path().starts_with(ADMIN_ROUTES) ||
                 req.path().starts_with(AUTHENTICATED_ROUTES)) {
-                return Ok(req.into_response(redirect_user(LOGIN_ROUTE))
+                let path = req.path().to_string();
+                return Ok(req.into_response(redirect_user_for_login(path))
                     .map_into_right_body());
             }
 

templates/login.html

@@ -1,6 +1,6 @@
 {% extends "base_login_page.html" %}
 {% block content %}
-<form action="/login" method="post">
+<form action="/login?redirect={{ redirect_uri }}" method="post">
     <div>
         <div class="form-floating">
             <input name="login" type="text" required class="form-control" id="floatingName" placeholder="unsername"

templates/password_reset.html

@@ -1,6 +1,6 @@
 {% extends "base_login_page.html" %}
 {% block content %}
-<form action="/login" method="post" id="reset_password_form">
+<form action="/login?redirect={{ redirect_uri }}" method="post" id="reset_password_form">
     <div>
         <p>You need to configure a new password:</p>
 
@@ -47,6 +47,7 @@
             form.submit();
     })
 
+
 </script>