local login with tsp via Keycloak works

apps/server/src/modules/class/domain/class-source-options.do.ts

@@ -12,4 +12,8 @@ export class ClassSourceOptions {
 	get tspUid(): string | undefined {
 		return this.props.tspUid;
 	}
+
+	set tspUid(tspUid: string | undefined) {
+		this.props.tspUid = tspUid;
+	}
 }

apps/server/src/modules/class/repo/classes.repo.ts

@@ -43,7 +43,8 @@ export class ClassesRepo {
 			? classes.map((aclass: Class): ClassEntity => ClassMapper.mapToEntity(aclass))
 			: [ClassMapper.mapToEntity(classes)];
 
-		await this.em.persistAndFlush(entities);
+		await this.em.upsertMany(entities);
+		await this.em.flush();
 	}
 
 	async updateMany(classes: Class[]): Promise<void> {

apps/server/src/modules/provisioning/dto/external-class.dto.ts

@@ -1,7 +1,7 @@
 export class ExternalClassDto {
 	public readonly externalId: string;
 
-	public readonly name?: string;
+	public readonly name: string;
 
 	constructor(props: Readonly<ExternalClassDto>) {
 		this.externalId = props.externalId;

apps/server/src/modules/provisioning/service/tsp-provisioning.service.ts

@@ -47,9 +47,7 @@ export class TspProvisioningService {
 			if (currentClass) {
 				// Case: Class exists -> update class
 				currentClass.schoolId = school.id;
-				if (clazz.name) {
-					currentClass.name = clazz.name;
-				}
+				currentClass.name = clazz.name;
 				currentClass.year = school.currentYear?.id;
 				currentClass.source = this.ENTITY_SOURCE;
 				currentClass.sourceOptions = new ClassSourceOptions({ tspUid: clazz.externalId });
@@ -115,7 +113,7 @@ export class TspProvisioningService {
 		roleRefs: RoleReference[],
 		schoolId: string
 	): Promise<UserDO> {
-		if (!externalUser.firstName || !externalUser.lastName || !externalUser.email) {
+		if (!externalUser.firstName || !externalUser.lastName) {
 			throw new BadDataLoggableException('User firstname, lastname or email is missing', { externalUser });
 		}
 
@@ -124,8 +122,9 @@ export class TspProvisioningService {
 			schoolId,
 			firstName: externalUser.firstName,
 			lastName: externalUser.lastName,
-			email: externalUser.email,
+			email: this.createTspEmail(externalUser.firstName, externalUser.lastName),
 			birthday: externalUser.birthday,
+			externalId: externalUser.externalId,
 		});
 		const savedUser = await this.userService.save(newUser);
 
@@ -137,7 +136,10 @@ export class TspProvisioningService {
 
 		const account = await this.accountService.findByUserId(user.id);
 
-		if (!account) {
+		if (account) {
+			await account.update(new AccountSave({ userId: user.id, systemId, username: user.email, activated: true }));
+			await this.accountService.save(account);
+		} else {
 			await this.accountService.saveWithValidation(
 				new AccountSave({
 					userId: user.id,
@@ -146,10 +148,6 @@ export class TspProvisioningService {
 					activated: true,
 				})
 			);
-		} else {
-			account.username = user.email;
-
-			await this.accountService.saveWithValidation(account);
 		}
 	}
 
@@ -159,4 +157,10 @@ export class TspProvisioningService {
 
 		return roleRefs;
 	}
+
+	private createTspEmail(firstname: string, lastname: string): string {
+		const email = `${firstname}.${lastname}@tsp.de`;
+
+		return email.toLowerCase();
+	}
 }

apps/server/src/modules/provisioning/strategy/tsp/tsp.jwt.payload.ts

@@ -1,33 +1,34 @@
-import { IsString, IsOptional } from 'class-validator';
+import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import { JwtPayload } from 'jsonwebtoken';
 
 export class TspJwtPayload implements JwtPayload {
 	@IsString()
+	@IsNotEmpty()
 	public sub!: string;
 
 	@IsOptional()
 	@IsString()
 	public sid: string | undefined;
 
-	@IsOptional()
 	@IsString()
-	public ptscListRolle: string | undefined;
+	@IsNotEmpty()
+	public ptscListRolle!: string;
 
-	@IsOptional()
 	@IsString()
-	public personVorname: string | undefined;
+	@IsNotEmpty()
+	public personVorname!: string;
 
-	@IsOptional()
 	@IsString()
-	public personNachname: string | undefined;
+	@IsNotEmpty()
+	public personNachname!: string;
 
-	@IsOptional()
 	@IsString()
-	public ptscSchuleNummer: string | undefined;
+	@IsNotEmpty()
+	public ptscSchuleNummer!: string;
 
-	@IsOptional()
 	@IsString()
-	public ptscListKlasseId: string | undefined;
+	@IsNotEmpty()
+	public ptscListKlasseId!: string;
 
 	constructor(data: Partial<TspJwtPayload>) {
 		Object.assign(this, data);

apps/server/src/modules/provisioning/strategy/tsp/tsp.strategy.ts

@@ -19,12 +19,6 @@ import { TspJwtPayload } from './tsp.jwt.payload';
 
 @Injectable()
 export class TspProvisioningStrategy extends ProvisioningStrategy {
-	RoleMapping: Record<string, RoleName> = {
-		lehrer: RoleName.TEACHER,
-		schueler: RoleName.STUDENT,
-		admin: RoleName.ADMINISTRATOR,
-	};
-
 	constructor(private readonly provisioningService: TspProvisioningService) {
 		super();
 	}
@@ -51,15 +45,15 @@ export class TspProvisioningStrategy extends ProvisioningStrategy {
 			externalId: payload.sub,
 			firstName: payload.personVorname,
 			lastName: payload.personNachname,
-			roles: (payload.ptscListRolle ?? '').split(',').map((tspRole) => this.RoleMapping[tspRole]),
+			roles: payload.ptscListRolle.split(',').map((role) => this.mapRoles(role)),
 		});
 
 		const externalSchoolDto = new ExternalSchoolDto({
 			externalId: payload.ptscSchuleNummer || '',
 		});
 
 		const externalClassDtoList = payload.ptscListKlasseId
-			? [new ExternalClassDto({ externalId: payload.ptscListKlasseId })]
+			? [new ExternalClassDto({ externalId: payload.ptscListKlasseId, name: '' })]
 			: [];
 
 		const oauthDataDto = new OauthDataDto({
@@ -83,4 +77,20 @@ export class TspProvisioningStrategy extends ProvisioningStrategy {
 
 		return new ProvisioningDto({ externalUserId: user.externalId || data.externalUser.externalId });
 	}
+
+	private mapRoles(tspRole: string): RoleName {
+		// TODO: Are all roles mapped correctly?
+		const roleNameLowerCase = tspRole.toLowerCase();
+
+		switch (roleNameLowerCase) {
+			case 'lehrer':
+				return RoleName.TEACHER;
+			case 'schueler':
+				return RoleName.STUDENT;
+			case 'administrator':
+				return RoleName.ADMINISTRATOR;
+			default:
+				return RoleName.USER;
+		}
+	}
 }