Merge remote-tracking branch 'origin/main' into mg-bicep-changes

solliancenet · Jan 31, 2024 · cbf3255 · cbf3255
2 parents 955653a + dfd9619
commit cbf3255
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 36 deletions.
diff --git a/src/dotnet/VectorizationAPI/Program.cs b/src/dotnet/VectorizationAPI/Program.cs
@@ -21,6 +21,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using FoundationaLLM.Common.Models.Configuration.Instance;
+using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/src/ui/ManagementPortal/middleware/auth.global.ts b/src/ui/ManagementPortal/middleware/auth.global.ts
@@ -4,23 +4,25 @@ import { useAuthStore } from '@/stores/authStore';
 export default defineNuxtRouteMiddleware(async (to, from) => {
 	if (process.server) return;
 
-	const msalInstance = await getMsalInstance();
-	await msalInstance.handleRedirectPromise();
-	const accounts = await msalInstance.getAllAccounts();
+	if (to.name !== 'status') {
+		const msalInstance = await getMsalInstance();
+		await msalInstance.handleRedirectPromise();
+		const accounts = await msalInstance.getAllAccounts();
 
-	const isAuthenticated = accounts.length > 0;
+		const isAuthenticated = accounts.length > 0;
 
-	if (isAuthenticated) {
-		const authStore = useAuthStore();
-		authStore.setAccounts(accounts);
-		createTokenRefreshTimer();
+		if (isAuthenticated) {
+			const authStore = useAuthStore();
+			authStore.setAccounts(accounts);
+			createTokenRefreshTimer();
 
-		if (to.name === 'auth/login') {
-    	return navigateTo({ path: '/' });
+			if (to.name === 'auth/login') {
+	    	return navigateTo({ path: '/' });
+			}
 		}
-	}
 
-	if (!isAuthenticated && to.name !== 'auth/login') {
-    return navigateTo({ name: 'auth/login' });
-  }
+		if (!isAuthenticated && to.name !== 'auth/login') {
+	    return navigateTo({ name: 'auth/login' });
+	  }	
+	}
 });
diff --git a/src/ui/ManagementPortal/pages/status.vue b/src/ui/ManagementPortal/pages/status.vue
@@ -2,12 +2,19 @@
 	<div>Status: {{ status }}</div>
 </template>
 
-<script>
-export default defineNuxtComponent({
-	asyncData() {
+<script setup lang="ts">
+definePageMeta({
+	name: 'status',
+	layout: false,
+});
+</script>
+
+<script lang="ts">
+export default {
+	data() {
 		return {
 			status: 'OK',
 		};
 	},
-});
+};
 </script>
diff --git a/src/ui/UserPortal/middleware/auth.global.ts b/src/ui/UserPortal/middleware/auth.global.ts
@@ -4,22 +4,24 @@ import { useAuthStore } from '@/stores/authStore';
 export default defineNuxtRouteMiddleware(async (to, from) => {
 	if (process.server) return;
 
-	const msalInstance = await getMsalInstance();
-	await msalInstance.handleRedirectPromise();
-	const accounts = await msalInstance.getAllAccounts();
+	if (to.name !== 'status') {
+		const msalInstance = await getMsalInstance();
+		await msalInstance.handleRedirectPromise();
+		const accounts = await msalInstance.getAllAccounts();
 
-	if (accounts.length > 0) {
-		const authStore = useAuthStore();
-		authStore.setAccounts(accounts);
-	}
+		if (accounts.length > 0) {
+			const authStore = useAuthStore();
+			authStore.setAccounts(accounts);
+		}
 
-	if (accounts.length > 0 && to.path !== '/') {
-		return navigateTo({ path: '/', query: from.query });
-	}
+		if (accounts.length > 0 && to.path !== '/') {
+			return navigateTo({ path: '/', query: from.query });
+		}
 
-	if (accounts.length === 0 && to.name !== 'auth/login') {
-		return navigateTo({ name: 'auth/login', query: from.query });
-	} else {
-		createTokenRefreshTimer();
+		if (accounts.length === 0 && to.name !== 'auth/login') {
+			return navigateTo({ name: 'auth/login', query: from.query });
+		} else {
+			createTokenRefreshTimer();
+		}
 	}
 });
diff --git a/src/ui/UserPortal/pages/status.vue b/src/ui/UserPortal/pages/status.vue
@@ -2,12 +2,18 @@
 	<div>Status: {{ status }}</div>
 </template>
 
-<script>
-export default defineNuxtComponent({
-	asyncData() {
+<script setup lang="ts">
+definePageMeta({
+	name: 'status',
+});
+</script>
+
+<script lang="ts">
+export default {
+	data() {
 		return {
 			status: 'OK',
 		};
 	},
-});
+};
 </script>