Merge pull request #769 from futa-ikeda/feature/login-url

[ENG-9167] Add next param to login URL redirect

Author: nsemets

src/app/core/services/auth.service.ts

@@ -35,22 +35,24 @@ export class AuthService {
 
   navigateToSignIn(): void {
     this.loaderService.show();
-    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`;
+    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
     window.location.href = loginUrl;
   }
 
   navigateToOrcidSignIn(): void {
     const loginUrl = `${this.casUrl}/login?${urlParam({
       redirectOrcid: 'true',
-      service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
+      service: `${this.webUrl}/login`,
+      next: window.location.href,
     })}`;
     window.location.href = loginUrl;
   }
 
   navigateToInstitutionSignIn(): void {
     const loginUrl = `${this.casUrl}/login?${urlParam({
       campaign: 'institution',
-      service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
+      service: `${this.webUrl}/login`,
+      next: window.location.href,
     })}`;
     window.location.href = loginUrl;
   }