refactor: extraire fonction qui determine si le param 'op' est dans le param next_url

Author: dmc1985

front/src/routes/+layout.ts

@@ -4,7 +4,7 @@ import { redirect } from "@sveltejs/kit";
 import { get } from "svelte/store";
 import type { LayoutLoad } from "./$types";
 import { needToAcceptCgu } from "$lib/utils/cgu";
-import { ORIENTATION_JWT_QUERY_PARAM } from "$lib/consts";
+import { doesUrlHaveOrientationJwt } from "./auth/utils";
 
 export const prerender = false;
 
@@ -34,13 +34,9 @@ export const load: LayoutLoad = async ({ url }) => {
     currentUserInfo = get(userInfo);
   }
 
-  const nextParam = url.searchParams.get("next");
-  const nextUrl = nextParam ? new URL(nextParam, url.origin) : null;
-  const hasOpJwt =
-    url.searchParams.has(ORIENTATION_JWT_QUERY_PARAM) ||
-    nextUrl?.searchParams.has(ORIENTATION_JWT_QUERY_PARAM) === true;
+  const hasOrientationJwt = doesUrlHaveOrientationJwt(url);
 
-  if (currentUserInfo && !hasOpJwt) {
+  if (currentUserInfo && !hasOrientationJwt) {
     // ⚠ Il est nécessaire d'acceder à url.pathname ici pour que cette fonction `load`
     // soit rappelée quand l'URL change, sans quoi SvelteKit optimise l'appel.
     // Voir: https://kit.svelte.dev/docs/load#rerunning-load-functions
@@ -85,6 +81,6 @@ export const load: LayoutLoad = async ({ url }) => {
   }
 
   return {
-    hasOpJwt,
+    hasOpJwt: hasOrientationJwt,
   };
 };

front/src/routes/auth/pc-callback/+page.ts

@@ -1,19 +1,18 @@
 import { CANONICAL_URL } from "$lib/env";
 import { redirect } from "@sveltejs/kit";
-import { getNextPage } from "../utils";
-import { ORIENTATION_JWT_QUERY_PARAM } from "$lib/consts";
+import { getNextPage, doesUrlHaveOrientationJwt } from "../utils";
 
 export const load = ({ url }) => {
   const nextPage = getNextPage(url);
+  const hasOrientationJwt = doesUrlHaveOrientationJwt(url);
+
   url.searchParams.delete("next");
 
   const qsParams = url.searchParams.toString();
 
-  const nextPageUrl = new URL(nextPage, CANONICAL_URL);
-
   if (
     (url.searchParams.has("siret") || url.searchParams.has("safir")) &&
-    !nextPageUrl.searchParams.has(ORIENTATION_JWT_QUERY_PARAM)
+    !hasOrientationJwt
   ) {
     // Lors de l'identification OIDC côté backend, il a été demandé
     // de proposer à l'utilisateur le rattachement vers une structure

front/src/routes/auth/utils.ts

@@ -1,3 +1,17 @@
+import { ORIENTATION_JWT_QUERY_PARAM } from "$lib/consts";
+
+export function doesUrlHaveOrientationJwt(url: URL): boolean {
+  if (url.searchParams.has(ORIENTATION_JWT_QUERY_PARAM)) {
+    return true;
+  }
+  const nextParam = url.searchParams.get("next");
+  if (nextParam) {
+    const nextUrl = new URL(nextParam, url.origin);
+    return nextUrl.searchParams.has(ORIENTATION_JWT_QUERY_PARAM);
+  }
+  return false;
+}
+
 export function getNextPage(url: URL) {
   const next = url.searchParams.get("next");
   const basePath = next && next.startsWith("/") ? next : "/";