Merge pull request #335 from fccview/develop

1.17.1

Author: fccview

app/(loggedOutRoutes)/auth/login/page.tsx

@@ -16,10 +16,7 @@ export default async function LoginPage() {
     process.env.SSO_FALLBACK_LOCAL !== "false";
 
   const hasExistingUsers = await hasUsers();
-  if (
-    (!hasExistingUsers && ssoEnabled && allowLocal) ||
-    (!hasExistingUsers && !ssoEnabled)
-  ) {
+  if (!hasExistingUsers && !ssoEnabled || !hasExistingUsers && allowLocal) {
     redirect("/auth/setup");
   }
 

app/(loggedOutRoutes)/auth/setup/page.tsx

@@ -6,12 +6,13 @@ import { AuthShell } from "@/app/_components/GlobalComponents/Auth/AuthShell";
 export const dynamic = "force-dynamic";
 
 export default async function SetupPage() {
+  const ssoEnabled = process.env.SSO_MODE === "oidc";
   const allowLocal =
     process.env.SSO_FALLBACK_LOCAL &&
     process.env.SSO_FALLBACK_LOCAL !== "no" &&
     process.env.SSO_FALLBACK_LOCAL !== "false";
 
-  if (!allowLocal) {
+  if (ssoEnabled && !allowLocal) {
     redirect("/auth/login");
   }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jotty.page",
-    "version": "1.17.0",
+    "version": "1.17.1",
     "private": true,
     "scripts": {
         "dev": "next dev",