fix(bugs): fixed bugs

Author: nsemets

src/app/app.routes.ts

@@ -38,6 +38,7 @@ export const routes: Routes = [
       },
       {
         path: 'register',
+        canActivate: [redirectIfLoggedInGuard],
         loadComponent: () =>
           import('./features/auth/pages/sign-up/sign-up.component').then((mod) => mod.SignUpComponent),
         data: { skipBreadcrumbs: true },

src/app/core/components/breadcrumb/breadcrumb.component.html

@@ -2,7 +2,7 @@
   <div class="breadcrumbs flex align-items-center gap-2 md:p-5 md:pb-0 xl:p-0">
     <osf-icon iconClass="fas fa-home"></osf-icon>
     <p>/</p>
-    @for (url of parsedUrl(); track url; let l = $last) {
+    @for (url of parsedUrl(); track $index; let l = $last) {
       {{ url }}
       @if (!l) {
         /

src/app/core/components/header/header.component.ts

@@ -42,7 +42,7 @@ export class HeaderComponent {
       command: () => {
         this.loaderService.show();
         this.actions.logout();
-        this.router.navigate(['/home']).then(() => window.location.reload());
+        this.router.navigate(['/']).then(() => window.location.reload());
       },
     },
   ];

src/app/core/helpers/index.ts

@@ -2,3 +2,4 @@ export * from './http.helper';
 export * from './i18n.helper';
 export * from './nav-menu.helper';
 export * from './types.helper';
+export * from './url-param.helper';

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

@@ -0,0 +1,5 @@
+export const urlParam = (params: Record<string, string>) => {
+  return Object.entries(params)
+    .map((entry) => entry.map((comp) => encodeURIComponent(comp)).join('='))
+    .join('&');
+};

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

@@ -1,13 +1,31 @@
 import { Injectable } from '@angular/core';
 
+import { urlParam } from '../helpers/url-param.helper';
+
 import { environment } from 'src/environments/environment';
 
 @Injectable({
   providedIn: 'root',
 })
 export class NavigationService {
   navigateToSignIn(): void {
-    const loginUrl = `${environment.casUrl}/login?service=${environment.webUrl}/login`;
+    const loginUrl = `${environment.casUrl}/login?${urlParam({ service: `${environment.webUrl}/login` })}`;
+    window.location.href = loginUrl;
+  }
+
+  navigateToOrcidSingIn(): void {
+    const loginUrl = `${environment.casUrl}/login?${urlParam({
+      redirectOrcid: 'true',
+      service: `${environment.webUrl}/login/?next=${encodeURIComponent(environment.webUrl)}`,
+    })}`;
+    window.location.href = loginUrl;
+  }
+
+  navigateToInstitutionSignIn(): void {
+    const loginUrl = `${environment.casUrl}/login?${urlParam({
+      campaign: 'institution',
+      service: `${environment.webUrl}/login/?next=${encodeURIComponent(environment.webUrl)}`,
+    })}`;
     window.location.href = loginUrl;
   }
 }

src/app/features/auth/pages/sign-up/sign-up.component.html

@@ -4,7 +4,13 @@ <h2 class="text-center">{{ 'auth.signUp.title' | translate }}</h2>
 
     <form [formGroup]="signUpForm" class="mt-6" (ngSubmit)="onSubmit()">
       <div class="flex flex-column gap-3">
-        <p-button class="btn-full-width" [label]="'auth.signUp.social.orcid' | translate" variant="text" raised>
+        <p-button
+          class="btn-full-width"
+          [label]="'auth.signUp.social.orcid' | translate"
+          variant="text"
+          raised
+          (onClick)="navigateToOrcidSingIn()"
+        >
           <img ngSrc="assets/images/orcid.svg" alt="Orchid icon" height="20" width="20" />
         </p-button>
 
@@ -14,6 +20,7 @@ <h2 class="text-center">{{ 'auth.signUp.title' | translate }}</h2>
           variant="text"
           raised
           icon="fas fa-landmark fa-lg"
+          (onClick)="navigateToInstitutionSingIn()"
         >
         </p-button>
       </div>

src/app/features/auth/pages/sign-up/sign-up.component.scss

@@ -1,15 +1,16 @@
-@use "assets/styles/mixins" as mix;
-
 :host {
-  @include mix.flex-column-center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   flex: 1;
   background: url("/assets/images/dark-blue-gradient.png") center no-repeat;
   background-size: cover;
 }
 
 .sign-up-container,
 .message-container {
-  @include mix.flex-column;
+  display: flex;
+  flex-direction: column;
   background: var(--white);
   border-radius: 0.6rem;
   box-shadow: 0 2px 4px var(--grey-outline);
@@ -22,10 +23,6 @@
   }
 }
 
-.sign-up-container {
-  flex: 1;
-}
-
 .message-container {
   margin: auto;
 }

src/app/features/auth/pages/sign-up/sign-up.component.ts

@@ -9,10 +9,11 @@ import { Divider } from 'primeng/divider';
 import { Password } from 'primeng/password';
 
 import { CommonModule, NgOptimizedImage } from '@angular/common';
-import { Component, OnInit, signal } from '@angular/core';
+import { Component, inject, OnInit, signal } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { RouterLink } from '@angular/router';
 
+import { NavigationService } from '@osf/core/services';
 import { RegisterUser } from '@osf/features/auth/store';
 import { PasswordInputHintComponent, TextInputComponent } from '@osf/shared/components';
 import { InputLimits } from '@osf/shared/constants';
@@ -42,14 +43,15 @@ import { environment } from 'src/environments/environment';
   styleUrl: './sign-up.component.scss',
 })
 export class SignUpComponent implements OnInit {
+  private readonly navigateService = inject(NavigationService);
+
+  private readonly actions = createDispatchMap({ registerUser: RegisterUser });
+
   signUpForm = new FormGroup<SignUpForm>({} as SignUpForm);
   passwordRegex: RegExp = PASSWORD_REGEX;
   inputLimits = InputLimits;
-
   isFormSubmitted = signal(false);
 
-  actions = createDispatchMap({ registerUser: RegisterUser });
-
   readonly siteKey = environment.recaptchaSiteKey;
 
   get isPasswordError() {
@@ -105,4 +107,12 @@ export class SignUpComponent implements OnInit {
       },
     });
   }
+
+  navigateToOrcidSingIn(): void {
+    this.navigateService.navigateToOrcidSingIn();
+  }
+
+  navigateToInstitutionSingIn(): void {
+    this.navigateService.navigateToInstitutionSignIn();
+  }
 }

src/app/features/auth/store/auth.state.ts

@@ -25,17 +25,17 @@ export class AuthState {
 
   @Action(RegisterUser)
   signUp(ctx: StateContext<AuthStateModel>, action: RegisterUser) {
-    return this.authService.register(action.payload).subscribe();
+    return this.authService.register(action.payload);
   }
 
   @Action(ForgotPassword)
   forgotPassword(ctx: StateContext<AuthStateModel>, action: ForgotPassword) {
-    return this.authService.forgotPassword(action.email).subscribe();
+    return this.authService.forgotPassword(action.email);
   }
 
   @Action(ResetPassword)
   resetPassword(ctx: StateContext<AuthStateModel>, { userId, token, newPassword }: ResetPassword) {
-    return this.authService.resetPassword(userId, token, newPassword).subscribe();
+    return this.authService.resetPassword(userId, token, newPassword);
   }
 
   @Action(SetAuthenticated)