11import { defaultInstanceRouteUpOne } from '@/config/constants' ;
22import { ClusterInstanceSignIn } from '@/features/auth/ClusterInstanceSignIn' ;
3+ import { authStore } from '@/features/auth/store/authStore' ;
34import { createRoute , redirect } from '@tanstack/react-router' ;
45import { clusterLayoutRoute } from './clusterLayoutRoute' ;
56import { FinishSetup } from './FinishSetup' ;
@@ -30,7 +31,8 @@ const clusterSignInRoute = createRoute({
3031 path : 'sign-in' ,
3132 component : ClusterInstanceSignIn ,
3233 beforeLoad : ( { context, location, params } ) => {
33- if ( context . authentication [ params . clusterId ] ?. user ) {
34+ const isFabricConnect = authStore . checkForFabricConnect ( params . clusterId ) ;
35+ if ( context . authentication [ params . clusterId ] ?. user && ! isFabricConnect ) {
3436 const search : Record < string , string > = location ?. search ;
3537 throw redirect ( {
3638 to : search ?. redirect ?. startsWith ( '/' )
@@ -46,7 +48,11 @@ const instanceSignInRoute = createRoute({
4648 path : 'instance/$instanceId/sign-in' ,
4749 component : ClusterInstanceSignIn ,
4850 beforeLoad : ( { context, location, params } ) => {
49- if ( context . authentication [ params . instanceId || params . clusterId ] ?. user ) {
51+ const isFabricConnect = authStore . checkForFabricConnect ( params . clusterId ) ;
52+ if ( isFabricConnect ) {
53+ return ;
54+ }
55+ if ( context . authentication [ params . instanceId ] ?. user || context . authentication [ params . clusterId ] ?. user ) {
5056 const search : Record < string , string > = location ?. search ;
5157 throw redirect ( {
5258 to : search ?. redirect ?. startsWith ( '/' )
0 commit comments