feat: fakeLogin, clean take(1)

sovity · Oct 15, 2024 · 51cb774 · 51cb774
1 parent 78b4d77
commit 51cb774
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/authority-portal-frontend/src/app/core/api/fake-backend/impl/fake-users.ts b/authority-portal-frontend/src/app/core/api/fake-backend/impl/fake-users.ts
@@ -310,6 +310,12 @@ export const updateLoggedInUser = (patcher: Patcher<UserInfo>) => {
   currentlyLoggedInUser = patchObj<UserInfo>(currentlyLoggedInUser, patcher);
 };
 
+export const fakeLogin = () => {
+  currentlyLoggedInUser = buildUserInfo(
+    ALL_USERS['00000000-0000-0000-0000-000000000001'],
+  );
+};
+
 /**
  * Fake implementation for "userInfo" endpoint
  */

diff --git a/authority-portal-frontend/src/app/pages/catalog-page/catalog-page/catalog-page.component.ts b/authority-portal-frontend/src/app/pages/catalog-page/catalog-page/catalog-page.component.ts
@@ -115,7 +115,6 @@ export class CatalogPageComponent implements OnInit, OnDestroy {
         switchMap((isMyDataOffers) => {
           if (isMyDataOffers) {
             return this.globalStateUtils.userInfo$.pipe(
-              take(1),
               map((it) => it.organizationId),
             );
           }

diff --git a/...app/pages/control-center-user-edit-page/state/control-center-user-edit-page-state-impl.ts b/...app/pages/control-center-user-edit-page/state/control-center-user-edit-page-state-impl.ts
@@ -50,7 +50,6 @@ export class ControlCenterUserEditPageStateImpl {
   @Action(Reset)
   onReset(ctx: Ctx, action: Reset): Observable<never> {
     return this.globalStateUtils.userInfo$.pipe(
-      take(1),
       switchMap((userInfo) =>
         this.apiService.getUserDetailDto(userInfo.userId),
       ),

diff --git a/...empty-pages/unauthenticated-page/unauthenticated-page/unauthenticated-page.component.html b/...empty-pages/unauthenticated-page/unauthenticated-page/unauthenticated-page.component.html
@@ -14,7 +14,7 @@
       <a
         id="btn-login"
         class="w-[300px] bg-black hover:bg-black text-white font-bold py-2 px-4 rounded active:scale-[0.99]"
-        [attr.href]="loginUrl">
+        (click)="login()">
         Log In
       </a>
       <a

diff --git a/...s/empty-pages/unauthenticated-page/unauthenticated-page/unauthenticated-page.component.ts b/...s/empty-pages/unauthenticated-page/unauthenticated-page/unauthenticated-page.component.ts
@@ -12,6 +12,7 @@
  */
 import {Component, Inject} from '@angular/core';
 import {Title} from '@angular/platform-browser';
+import {fakeLogin} from 'src/app/core/api/fake-backend/impl/fake-users';
 import {APP_CONFIG, AppConfig} from 'src/app/core/services/config/app-config';
 
 @Component({
@@ -31,4 +32,12 @@ export class UnauthenticatedPageComponent {
     url.searchParams.set('redirect_uri', location.href);
     return url.toString();
   }
+
+  login() {
+    if (this.appConfig.useFakeBackend) {
+      fakeLogin();
+    } else {
+      location.href = this.loginUrl;
+    }
+  }
 }
diff --git a/...egistration-pages/organization-onboard-page/state/organization-onboard-page-state-impl.ts b/...egistration-pages/organization-onboard-page/state/organization-onboard-page-state-impl.ts
@@ -54,7 +54,6 @@ export class OrganizationOnboardPageStateImpl {
   @Action(Reset, {cancelUncompleted: true})
   onReset(ctx: StateContext<OrganizationOnboardPageState>): Observable<never> {
     return this.globalStateUtils.userInfo$.pipe(
-      take(1),
       switchMap((userInfo) =>
         combineLatest([
           this.apiService.getOrganizationUser(userInfo.userId),