Merge pull request #886 from ihorsokhanexoft/fix/ENG-10262-2

fix(ENG-10262): fixed login url encoding

Author: nsemets

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 { doubleEncodedUrlParam, 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,7 @@ export class AuthService {
     }
 
     this.loaderService.show();
-    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
+    const loginUrl = `${this.casUrl}/login?${doubleEncodedUrlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
     window.location.href = loginUrl;
   }
 

src/app/shared/helpers/url-param.helper.ts

@@ -3,3 +3,15 @@ export const urlParam = (params: Record<string, string>) => {
     .map((entry) => entry.map((comp) => encodeURIComponent(comp)).join('='))
     .join('&');
 };
+
+export const doubleEncodedUrlParam = (params: { service: string; next?: string }): string => {
+  const { service, next } = params;
+
+  if (!next) {
+    return `service=${encodeURIComponent(service)}`;
+  }
+
+  const encodedNext = encodeURIComponent(next);
+  const valueAfterService = `${service}?next=${encodedNext}`;
+  return `service=${encodeURIComponent(valueAfterService)}`;
+};