Other entity login

src/app/core/entity/default-datatype/view.directive.ts

@@ -1,5 +1,5 @@
 import { Entity } from "../model/entity";
-import { Directive, Input, OnChanges } from "@angular/core";
+import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core";
 
 @Directive()
 export abstract class ViewDirective<T, C = any> implements OnChanges {
@@ -12,7 +12,7 @@ export abstract class ViewDirective<T, C = any> implements OnChanges {
   /** indicating that the value is not in its original state, so that components can explain this to the user */
   isPartiallyAnonymized: boolean;
 
-  ngOnChanges() {
+  ngOnChanges(changes?: SimpleChanges) {
     this.isPartiallyAnonymized =
       this.entity?.anonymized &&
       this.entity?.getSchema()?.get(this.id)?.anonymize === "retain-anonymized";

src/app/core/session/auth/keycloak/account-page/account-page.component.ts

@@ -45,7 +45,6 @@ export class AccountPageComponent implements OnInit {
       return;
     }
 
-    // TODO can we use keycloak for this?
     this.authService.setEmail(this.email.value).subscribe({
       next: () =>
         this.alertService.addInfo(

src/app/core/session/session-service/session-manager.service.spec.ts

@@ -38,6 +38,7 @@ import { EntityMapperService } from "../../entity/entity-mapper/entity-mapper.se
 import { mockEntityMapper } from "../../entity/entity-mapper/mock-entity-mapper-service";
 import { User } from "../../user/user";
 import { TEST_USER } from "../../user/demo-user-generator.service";
+import { Child } from "../../../child-dev-project/children/model/child";
 
 describe("SessionManagerService", () => {
   let service: SessionManagerService;
@@ -141,6 +142,23 @@ describe("SessionManagerService", () => {
     expect(currentUser.value).toEqual(adminUser);
   });
 
+  it("should allow other entities to log in", async () => {
+    const childSession: SessionInfo = { name: "Child:123", roles: [] };
+    mockKeycloak.login.and.resolveTo(childSession);
+    const loggedInChild = new Child("123");
+    const otherChild = new Child("456");
+    await TestBed.inject(EntityMapperService).saveAll([
+      loggedInChild,
+      otherChild,
+    ]);
+
+    await service.remoteLogin();
+
+    expect(sessionInfo.value).toBe(childSession);
+    expect(loginStateSubject.value).toBe(LoginState.LOGGED_IN);
+    expect(TestBed.inject(CurrentUserSubject).value).toEqual(loggedInChild);
+  });
+
   it("should automatically login, if the session is still valid", async () => {
     await service.remoteLogin();
 

src/app/core/session/session-service/session-manager.service.ts

@@ -34,6 +34,7 @@ import { CurrentUserSubject } from "../current-user-subject";
 import { EntityMapperService } from "../../entity/entity-mapper/entity-mapper.service";
 import { filter } from "rxjs/operators";
 import { Subscription } from "rxjs";
+import { Entity } from "../../entity/model/entity";
 
 /**
  * This service handles the user session.
@@ -96,18 +97,23 @@ export class SessionManagerService {
     return this.initializeUser(user);
   }
 
-  private async initializeUser(user: SessionInfo) {
-    await this.initializeDatabaseForCurrentUser(user);
-    this.sessionInfo.next(user);
+  private async initializeUser(session: SessionInfo) {
+    await this.initializeDatabaseForCurrentUser(session);
+    this.sessionInfo.next(session);
     this.loginStateSubject.next(LoginState.LOGGED_IN);
+    this.initUserEntity(session);
+  }
 
-    // TODO allow generic entities with fallback to User entity
+  private initUserEntity(user: SessionInfo) {
+    const entityType = user.name.includes(":")
+      ? Entity.extractTypeFromId(user.name)
+      : User;
     this.entityMapper
-      .load(User, user.name)
+      .load(entityType, user.name)
       .then((res) => this.currentUser.next(res))
       .catch(() => undefined);
     this.updateSubscription = this.entityMapper
-      .receiveUpdates(User)
+      .receiveUpdates(entityType)
       .pipe(
         filter(
           ({ entity }) =>

src/app/core/user/user-security/user-security.component.spec.ts

@@ -33,7 +33,7 @@ describe("UserSecurityComponent", () => {
     name: "Not Assigned Role",
     description: "this role is not assigned to the user",
   };
-  const user = { name: "test-user" } as User;
+  const user = Object.assign(new User(), { username: "test-user" });
   let keycloakUser: KeycloakUser;
 
   beforeEach(async () => {
@@ -57,7 +57,7 @@ describe("UserSecurityComponent", () => {
         {
           provide: SessionSubject,
           useValue: new BehaviorSubject({
-            name: user.name,
+            name: user.getId(true),
             roles: [KeycloakAuthService.ACCOUNT_MANAGER_ROLE],
           }),
         },
@@ -80,7 +80,7 @@ describe("UserSecurityComponent", () => {
 
     expect(component.user).toBe(keycloakUser);
     expect(component.form).toHaveValue({
-      username: user.name,
+      username: user.toString(),
       email: "my@email.de",
       roles: [assignedRole],
     });
@@ -116,7 +116,7 @@ describe("UserSecurityComponent", () => {
     expect(mockHttp.post).toHaveBeenCalledWith(
       jasmine.stringMatching(/\/account$/),
       {
-        username: user.name,
+        username: user.toString(),
         email: "new@email.com",
         roles: [assignedRole],
         enabled: true,

src/app/core/user/user-security/user-security.component.ts

@@ -11,7 +11,6 @@ import {
   KeycloakUser,
   Role,
 } from "../../session/auth/keycloak/keycloak-auth.service";
-import { User } from "../user";
 import { AlertService } from "../../alerts/alert.service";
 import { HttpClient } from "@angular/common/http";
 import { AppSettings } from "../../app-settings";
@@ -23,6 +22,8 @@ import { MatInputModule } from "@angular/material/input";
 import { MatSelectModule } from "@angular/material/select";
 import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy";
 import { SessionSubject } from "../../session/auth/session-info";
+import { Entity } from "../../entity/model/entity";
+import { catchError } from "rxjs/operators";
 
 @UntilDestroy()
 @DynamicComponent("UserSecurity")
@@ -43,7 +44,7 @@ import { SessionSubject } from "../../session/auth/session-info";
   standalone: true,
 })
 export class UserSecurityComponent implements OnInit {
-  @Input() entity: User;
+  @Input() entity: Entity;
   form = this.fb.group({
     username: [{ value: "", disabled: true }],
     email: ["", [Validators.required, Validators.email]],
@@ -91,12 +92,15 @@ export class UserSecurityComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.form.get("username").setValue(this.entity.name);
+    this.form.get("username").setValue(this.entity.toString());
     if (this.authService) {
-      this.authService.getUser(this.entity.name).subscribe({
-        next: (res) => this.assignUser(res),
-        error: () => undefined,
-      });
+      this.authService
+        .getUser(this.entity.getId(true))
+        .pipe(catchError(() => this.authService.getUser(this.entity.getId())))
+        .subscribe({
+          next: (res) => this.assignUser(res),
+          error: () => undefined,
+        });
     }
   }
 

src/app/features/todos/todo-completion/display-todo-completion/display-todo-completion.component.html

@@ -4,6 +4,6 @@
     <span i18n>completed</span>
   </div>
   <div class="completed-details" i18n>
-    by {{ value.completedBy }} on {{ value.completedAt | date }}
+    by {{ completedBy.toString() }} on {{ value.completedAt | date }}
   </div>
 </div>

src/app/features/todos/todo-completion/display-todo-completion/display-todo-completion.component.ts

@@ -1,16 +1,41 @@
-import { Component } from "@angular/core";
+import { Component, OnChanges, SimpleChanges } from "@angular/core";
 import { DynamicComponent } from "../../../../core/config/dynamic-components/dynamic-component.decorator";
 import { ViewDirective } from "../../../../core/entity/default-datatype/view.directive";
 import { TodoCompletion } from "../../model/todo-completion";
 import { DatePipe, NgIf } from "@angular/common";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
+import { EntityMapperService } from "../../../../core/entity/entity-mapper/entity-mapper.service";
+import { Entity } from "../../../../core/entity/model/entity";
+import { User } from "../../../../core/user/user";
+import { DisplayEntityComponent } from "../../../../core/basic-datatypes/entity/display-entity/display-entity.component";
 
 @DynamicComponent("DisplayTodoCompletion")
 @Component({
   selector: "app-display-todo-completion",
   templateUrl: "./display-todo-completion.component.html",
   styleUrls: ["./display-todo-completion.component.scss"],
   standalone: true,
-  imports: [NgIf, FontAwesomeModule, DatePipe],
+  imports: [NgIf, FontAwesomeModule, DatePipe, DisplayEntityComponent],
 })
-export class DisplayTodoCompletionComponent extends ViewDirective<TodoCompletion> {}
+export class DisplayTodoCompletionComponent
+  extends ViewDirective<TodoCompletion>
+  implements OnChanges
+{
+  completedBy: Entity;
+  constructor(private entityMapper: EntityMapperService) {
+    super();
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    super.ngOnChanges(changes);
+    if (changes.hasOwnProperty("value") && this.value.completedBy) {
+      const entityId = this.value.completedBy;
+      const entityType = entityId.includes(":")
+        ? Entity.extractTypeFromId(entityId)
+        : User;
+      this.entityMapper
+        .load(entityType, entityId)
+        .then((res) => (this.completedBy = res));
+    }
+  }
+}

src/app/features/todos/todo.service.ts

@@ -19,14 +19,12 @@ export class TodoService {
     const nextTodo = await this.createNextRepetition(todo);
 
     todo.completed = {
-      completedBy: this.currentUser.value.getId(),
+      completedBy: this.currentUser.value.getId(true),
       completedAt: new Date(),
       nextRepetition: nextTodo?.getId(true),
     };
 
     await this.entityMapper.save(todo);
-
-    // TODO: user block instead of id to display in template
   }
 
   private async createNextRepetition(originalTodo: Todo): Promise<Todo | null> {