N21-1324 school in migration err

hpi-schul-cloud · Sep 29, 2023 · f82ea23 · f82ea23
1 parent f503620
commit f82ea23
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/apps/server/src/modules/oauth/controller/oauth-sso.controller.ts b/apps/server/src/modules/oauth/controller/oauth-sso.controller.ts
@@ -30,6 +30,7 @@ import { OauthUc } from '../uc';
 import { OauthLoginStateDto } from '../uc/dto/oauth-login-state.dto';
 import { AuthorizationParams, SSOLoginQuery, SystemIdParams } from './dto';
 import { StatelessAuthorizationParams } from './dto/stateless-authorization.params';
+import { SchoolInMigrationError } from '../../authentication/errors/school-in-migration.error';
 
 @ApiTags('SSO')
 @Controller('sso')
@@ -47,7 +48,16 @@ export class OauthSSOController {
 
 	private errorHandler(error: unknown, session: ISession, res: Response, provider?: string) {
 		this.logger.error(error);
-		const ssoError: OAuthSSOError = error instanceof OAuthSSOError ? error : new OAuthSSOError();
+		// const ssoError: OAuthSSOError = error instanceof OAuthSSOError ? error : new OAuthSSOError();
+		let ssoError: OAuthSSOError;
+
+		if (error instanceof SchoolInMigrationError) {
+			ssoError = new OAuthSSOError(error.message, error.type);
+		} else if (error instanceof OAuthSSOError) {
+			ssoError = error;
+		} else {
+			ssoError = new OAuthSSOError();
+		}
 
 		session.destroy((err) => {
 			this.logger.log(err);

diff --git a/apps/server/src/modules/user-login-migration/service/migration-check.service.ts b/apps/server/src/modules/user-login-migration/service/migration-check.service.ts
@@ -21,8 +21,15 @@ export class MigrationCheckService {
 			);
 
 			const user: UserDO | null = await this.userService.findByExternalId(externalUserId, systemId);
-
-			if (user?.lastLoginSystemChange && userLoginMigration && !userLoginMigration.closedAt) {
+			if (!user) {
+				throw new SchoolInMigrationError();
+			} else if (user && user.lastLoginSystemChange && userLoginMigration && !userLoginMigration.closedAt) {
+				const hasMigrated: boolean = user.lastLoginSystemChange > userLoginMigration.startedAt;
+				return !hasMigrated;
+			} else {
+				return !!userLoginMigration && !userLoginMigration.closedAt;
+			}
+			/* if (user?.lastLoginSystemChange && userLoginMigration && !userLoginMigration.closedAt) {
 				const hasMigrated: boolean = user.lastLoginSystemChange > userLoginMigration.startedAt;
 				return !hasMigrated;
 			}