fix: non administrator user redirection error while setup isn't finished

stonith404 · stonith404 · commit dc8cf3d5ca6b · 2023-02-11T15:57:21.000+01:00
diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
@@ -70,8 +70,8 @@ export async function middleware(request: NextRequest) {
       path: "/auth/signUp",
     },
     {
-      condition: getConfig("SETUP_STATUS") == "REGISTERED" && !routes.setupStatusRegistered.contains(route),
-      path: user ? "/admin/setup" : "/auth/signIn",
+      condition: getConfig("SETUP_STATUS") == "REGISTERED" && !routes.setupStatusRegistered.contains(route) && user?.isAdmin,
+      path: "/admin/setup",
     },
      // Authenticated state
      {

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ export async function middleware(request: NextRequest) {`
`70`	`70`	`path: "/auth/signUp",`
`71`	`71`	`},`
`72`	`72`	`{`
`73`		`- condition: getConfig("SETUP_STATUS") == "REGISTERED" && !routes.setupStatusRegistered.contains(route),`
`74`		`- path: user ? "/admin/setup" : "/auth/signIn",`
	`73`	`+ condition: getConfig("SETUP_STATUS") == "REGISTERED" && !routes.setupStatusRegistered.contains(route) && user?.isAdmin,`
	`74`	`+ path: "/admin/setup",`
`75`	`75`	`},`
`76`	`76`	`// Authenticated state`
`77`	`77`	`{`