From d99672dbd8c0f398324f5cab37aaf8e2a28d226c Mon Sep 17 00:00:00 2001
From: Julien Calixte <julien.calixte@theodo.com>
Date: Fri, 29 May 2026 16:49:44 +0200
Subject: [PATCH] fix(auth): return to origin path after GitHub login

Sign-in saves the current path in sessionStorage so the OAuth callback
can route back instead of always landing on Home.
---
 src/components/AuthorizeUser.vue            |  9 ++++++++-
 src/components/SignInGithub.vue             | 16 +++++++++++++++-
 src/modules/user/service/oauthReturnPath.ts |  7 +++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/user/service/oauthReturnPath.ts

diff --git a/src/components/AuthorizeUser.vue b/src/components/AuthorizeUser.vue
index b39aa0e..97d2f0c 100644
--- a/src/components/AuthorizeUser.vue
+++ b/src/components/AuthorizeUser.vue
@@ -3,6 +3,7 @@ import { onBeforeMount, ref } from "vue"
 import { useRoute, useRouter } from "vue-router"
 
 import { useGitHubLogin } from "@/hooks/useGitHubLogin.hook"
+import { consumeGithubOAuthReturnPath } from "@/modules/user/service/oauthReturnPath"
 import { signIn } from "@/modules/user/service/signIn"
 
 const route = useRoute()
@@ -22,7 +23,13 @@ onBeforeMount(async () => {
       await saveCredentials(token)
     }
 
-    router.replace({ name: "Home" })
+    const returnPath = consumeGithubOAuthReturnPath()
+
+    if (!hasError.value && returnPath) {
+      router.replace(returnPath)
+    } else {
+      router.replace({ name: "Home" })
+    }
   }
 })
 </script>
diff --git a/src/components/SignInGithub.vue b/src/components/SignInGithub.vue
index 98a458a..2675bbf 100644
--- a/src/components/SignInGithub.vue
+++ b/src/components/SignInGithub.vue
@@ -1,20 +1,34 @@
 <script lang="ts" setup>
+import { useRoute } from "vue-router"
+
+import { GITHUB_OAUTH_RETURN_PATH_KEY } from "@/modules/user/service/oauthReturnPath"
+
 const GITHUB_URL = "https://github.com/login/oauth/authorize"
 
 const CLIENT_ID = "Iv1.12dc43d013ce3623"
 const SCOPE = "repo%20workflow"
 const REDIRECT_URI = window.location.origin
 
+const route = useRoute()
+
 const url = new URL(GITHUB_URL)
 url.searchParams.set("client_id", CLIENT_ID)
 url.searchParams.set("scope", SCOPE)
 url.searchParams.set("redirect_uri", REDIRECT_URI)
 
 const href = url.toString()
+
+const saveReturnPath = () => {
+  sessionStorage.setItem(GITHUB_OAUTH_RETURN_PATH_KEY, route.fullPath)
+}
 </script>
 
 <template>
-  <a :href="href" class="sign-in-github btn btn-sm btn-primary">
+  <a
+    :href="href"
+    class="sign-in-github btn btn-sm btn-primary"
+    @click="saveReturnPath"
+  >
     Sign in with
     <svg
       xmlns="http://www.w3.org/2000/svg"
diff --git a/src/modules/user/service/oauthReturnPath.ts b/src/modules/user/service/oauthReturnPath.ts
new file mode 100644
index 0000000..fbc28d6
--- /dev/null
+++ b/src/modules/user/service/oauthReturnPath.ts
@@ -0,0 +1,7 @@
+export const GITHUB_OAUTH_RETURN_PATH_KEY = "github-oauth-return-path"
+
+export const consumeGithubOAuthReturnPath = (): string | null => {
+  const path = sessionStorage.getItem(GITHUB_OAUTH_RETURN_PATH_KEY)
+  sessionStorage.removeItem(GITHUB_OAUTH_RETURN_PATH_KEY)
+  return path
+}