Merge pull request #931 from Ostap-Zherebetskyi/fix/login_redirect

[ENG-10623] Fix login URL encoding hack

Author: cslzchen

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 { doubleEncodedUrlParam, urlParam } from '@osf/shared/helpers/url-param.helper';
+import { 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,8 +41,14 @@ export class AuthService {
     }
 
     this.loaderService.show();
-    const loginUrl = `${this.casUrl}/login?${doubleEncodedUrlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
-    window.location.href = loginUrl;
+
+    const serviceUrl = new URL(`${this.webUrl}/login`);
+    serviceUrl.searchParams.set('next', window.location.href);
+
+    const loginUrl = new URL(`${this.casUrl}/login`);
+    loginUrl.searchParams.set('service', serviceUrl.toString());
+
+    window.location.href = loginUrl.toString();
   }
 
   navigateToOrcidSignIn(): void {

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

@@ -3,15 +3,3 @@ 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)}`;
-};