From 617b1902995e56a4c2dd34ff5d4e02cc2901e0e1 Mon Sep 17 00:00:00 2001
From: Ihor Sokhan <isokhan@exoft.net>
Date: Fri, 13 Feb 2026 17:48:44 +0200
Subject: [PATCH 1/2] fix(eng-10262): added correct encoding of next query
 parameter

---
 src/app/core/services/auth.service.ts      | 11 +++++++++--
 src/app/shared/helpers/url-param.helper.ts | 11 +++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index b51cb58b9..da0063ce7 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -8,7 +8,7 @@ import { inject, Injectable, PLATFORM_ID } from '@angular/core';
 import { SignUpModel } from '@core/models/sign-up.model';
 import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ClearCurrentUser } from '@osf/core/store/user';
-import { urlParam } from '@osf/shared/helpers/url-param.helper';
+import { localUrlParam, urlParam } from '@osf/shared/helpers/url-param.helper';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { LoaderService } from '@osf/shared/services/loader.service';
 
@@ -41,7 +41,14 @@ export class AuthService {
     }
 
     this.loaderService.show();
-    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
+    let loginUrl = null;
+    if (this.environment.webUrl.includes('localhost')) {
+      // CAS should handle auth instead of angular, so we need to pass the next param
+      // in the service param to ensure the user is redirected back to the correct page after login
+      loginUrl = `${this.casUrl}/login?${localUrlParam({ service: `${this.webUrl.replace('4200', '5000')}/login`, next: window.location.href })}`;
+    } else {
+      loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
+    }
     window.location.href = loginUrl;
   }
 
diff --git a/src/app/shared/helpers/url-param.helper.ts b/src/app/shared/helpers/url-param.helper.ts
index 02e7e98c8..92d475247 100644
--- a/src/app/shared/helpers/url-param.helper.ts
+++ b/src/app/shared/helpers/url-param.helper.ts
@@ -3,3 +3,14 @@ export const urlParam = (params: Record<string, string>) => {
     .map((entry) => entry.map((comp) => encodeURIComponent(comp)).join('='))
     .join('&');
 };
+
+export const localUrlParam = (params: { service: string; next?: string }) => {
+  const { service, next } = params;
+
+  // encode "next" separately because it must be encoded twice
+  const encodedNext = next ? encodeURIComponent(next) : undefined;
+
+  const valueAfterService = encodedNext ? `${service}?next=${encodedNext}` : service;
+
+  return `service=${encodeURIComponent(valueAfterService)}`;
+};

From 7182269f180b5dfbfd7ef5e0f9d2d4d9e95fafdb Mon Sep 17 00:00:00 2001
From: ihorsokhanexoft <isokhan@exoft.net>
Date: Mon, 16 Feb 2026 18:09:19 +0200
Subject: [PATCH 2/2] Update src/app/shared/helpers/url-param.helper.ts

Co-authored-by: nsemets <nsemets@exoft.net>
---
 src/app/shared/helpers/url-param.helper.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/helpers/url-param.helper.ts b/src/app/shared/helpers/url-param.helper.ts
index 92d475247..ee2d479e6 100644
--- a/src/app/shared/helpers/url-param.helper.ts
+++ b/src/app/shared/helpers/url-param.helper.ts
@@ -4,13 +4,14 @@ export const urlParam = (params: Record<string, string>) => {
     .join('&');
 };
 
-export const localUrlParam = (params: { service: string; next?: string }) => {
+export const localUrlParam = (params: { service: string; next?: string }): string => {
   const { service, next } = params;
-
-  // encode "next" separately because it must be encoded twice
-  const encodedNext = next ? encodeURIComponent(next) : undefined;
-
-  const valueAfterService = encodedNext ? `${service}?next=${encodedNext}` : service;
-
+  
+  if (!next) {
+    return `service=${encodeURIComponent(service)}`;
+  }
+  
+  const encodedNext = encodeURIComponent(next);
+  const valueAfterService = `${service}?next=${encodedNext}`;
   return `service=${encodeURIComponent(valueAfterService)}`;
 };