Merge branch 'login-redirect' of 'https://github.com/evamillan/grimoi…

…relab-sortinghat/'

Merges #927 
Closes #925

releases/unreleased/redirect-to-the-original-url-after-log-in.yml

@@ -0,0 +1,8 @@
+---
+title: Redirect to the original URL after log in
+category: added
+author: Eva Millán <evamillan@bitergia.com>
+issue: 925
+notes: >
+  Users are now redirected to the page they originally
+  requested after they log in.

ui/src/router/index.js

@@ -77,6 +77,9 @@ router.beforeEach((to, from, next) => {
     if (!isAuthenticated) {
       next({
         path: "/login",
+        query: {
+          redirect: to.fullPath,
+        },
       });
     } else {
       next();

ui/src/views/Login.vue

@@ -66,7 +66,7 @@ export default {
         };
         const response = await this.login(authDetails);
         if (response) {
-          this.$router.push("/");
+          this.$router.push(this.$route.query.redirect || "/");
           this.$logger.info(`Log in user ${this.username}`);
         }
       } catch (error) {

ui/tests/e2e/specs/spec.cy.js

@@ -41,6 +41,23 @@ describe("Login", () => {
     cy.location("pathname").should("equal", "/login");
     cy.contains("Invalid credentials").should("be.visible");
   });
+
+  it("Redirects to the original URL after login", () => {
+    const path = "/settings/general";
+
+    cy.visit(path);
+    cy.location("pathname").should("equal", "/login");
+
+    cy.get("[id=username]").type(Cypress.env("USERNAME"));
+    cy.get("[id=password]").type(Cypress.env("PASSWORD"));
+    cy.contains("button", "Log in").click();
+    cy.wait("@auth")
+      .its("response.body.user")
+      .should("equal", Cypress.env("USERNAME"));
+
+    // Redirects to the original path
+    cy.location("pathname").should("equal", path);
+  });
 });
 
 describe("Authenticated operations", () => {