redirecting user

Signed-off-by: jackdisalvatore <[email protected]>

Author: JackDiSalvatore

frontend/src/lib/services/TenantsResolver/shared.ts

@@ -5,7 +5,7 @@ export const TenantsSchema = z.object({
 	name: z.string()
 });
 
-export type LibrePermissions = z.infer<typeof TenantsSchema>;
+export type Tenants = z.infer<typeof TenantsSchema>;
 
 export const TenantsSuccessResponseSchema = z.array(TenantsSchema);
 

frontend/src/lib/services/UnityAuth/UnityAuth.ts

@@ -50,21 +50,27 @@ export class UnityAuthServiceImpl
 	}
 
 	async login(email: string, password: string): Promise<CompleteLoginResponse> {
+		let completeLoginRes: CompleteLoginResponse;
+
 		const res = await this.axiosInstance.post('/api/login', {
 			username: email,
 			password: password
 		});
 
 		const loginRes = UnityAuthLoginResponseSchema.parse(res.data);
 
-		const tenantsRes = await this.tenantsResolver.getTenants(loginRes);
+		completeLoginRes = { ...loginRes };
 
-		if (!isTenantsSuccessResponse(tenantsRes)) {
-			throw new Error(tenantsRes.errorMessage);
-		}
-		console.log(tenantsRes);
+		try {
+			const tenantsRes = await this.tenantsResolver.getTenants(loginRes);
+			if (!isTenantsSuccessResponse(tenantsRes)) {
+				throw new Error(tenantsRes.errorMessage);
+			}
 
-		const completeLoginRes: CompleteLoginResponse = { ...loginRes };
+			completeLoginRes.tenants = tenantsRes;
+		} catch (e) {
+			console.log(e); // ignore users that do not belong to a tenant
+		}
 
 		this.loginData = completeLoginRes;
 

frontend/src/lib/services/UnityAuth/shared.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import type { TenantsResolver } from '../TenantsResolver/TenantsResolver';
+import { TenantsSchema } from '../TenantsResolver/shared';
 
 export const UnityAuthServicePropsSchema = z.object({
 	baseURL: z.string()
@@ -13,7 +14,8 @@ export const UnityAuthLoginResponseSchema = z.object({
 	access_token: z.string(),
 	token_type: z.string(),
 	expires_in: z.number(),
-	username: z.string()
+	username: z.string(),
+	tenants: z.array(TenantsSchema).optional()
 });
 
 export type UnityAuthLoginResponse = z.infer<typeof UnityAuthLoginResponseSchema>;

frontend/src/routes/login/+page.svelte

@@ -1,13 +1,15 @@
 <script lang="ts">
 	import { createInput, emailValidator } from '$lib/utils/validation';
-	import { useUnityAuthService } from '$lib/context/UnityAuthContext';
+	import { useUnityAuthContext, useUnityAuthService } from '$lib/context/UnityAuthContext';
 	import { goto } from '$app/navigation';
 	import { checkHasMessage, isHateoasErrorResponse } from '$lib/services/ServerErrors/ServerErrors';
 	import { isAxiosError } from 'axios';
 	import Login from '$lib/components/Login/Login.svelte';
 	import type { EventDispatchTypeMap } from '$lib/components/Login/login';
 
+	const unityAuthContext = useUnityAuthContext();
 	const authService = useUnityAuthService();
+	const user = unityAuthContext.user;
 
 	let emailInput = createInput('');
 	let passwordInput = createInput('');
@@ -29,7 +31,9 @@
 		if (emailInput.value && passwordInput.value) {
 			try {
 				await authService.login(emailInput.value, passwordInput.value);
-				goto('/tenant');
+
+				if ($user?.tenants) goto('/tenant');
+				else goto('/settings');
 			} catch (error: unknown) {
 				if (isAxiosError(error) && isHateoasErrorResponse(error.response?.data)) {
 					const hateoasError = error.response.data;