Update hivegrid-cloud reference to latest main
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e98d38e716
commit
7b21524c86
3781 files changed
+373484
-225607
No files matched your search
+6
-4
@@ -1,6 +1,6 @@
|
||||
import { defaultBrandTokens } from "@toolctrl/brand";
|
||||
import { loadRequiredWebConfig } from "@toolctrl/config";
|
||||
import { Prisma } from "@toolctrl/db/prisma-browser";
|
||||
import { defaultBrandTokens } from "@hivegrid/brand";
|
||||
import { loadRequiredWebConfig } from "@hivegrid/config";
|
||||
import { Prisma } from "@hivegrid/db/prisma-browser";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getPublicAuthProviders } from "../auth/authProviders.server";
|
||||
import { cachified, clearCacheKey } from "../cache.server";
|
||||
@@ -41,6 +41,7 @@ export type AppConfiguration = {
|
||||
slug: { require: boolean; type: "tenant" | "username" } | null;
|
||||
captcha: {
|
||||
enabled: boolean;
|
||||
provider: "mcaptcha" | "cap";
|
||||
instanceUrl: string;
|
||||
loginSiteKey: string;
|
||||
};
|
||||
@@ -139,6 +140,7 @@ export async function getAppConfiguration({ request }: { request: Request }): Pr
|
||||
slug: { require: false, type: "username" },
|
||||
captcha: {
|
||||
enabled: Boolean(webConfig.captcha.instanceUrl && webConfig.captcha.loginSiteKey),
|
||||
provider: webConfig.captcha.provider,
|
||||
instanceUrl: webConfig.captcha.instanceUrl ?? "",
|
||||
loginSiteKey: webConfig.captcha.loginSiteKey ?? "",
|
||||
},
|
||||
@@ -220,7 +222,7 @@ export async function getAppConfiguration({ request }: { request: Request }): Pr
|
||||
conf.auth.requireEmailVerification = appConfiguration?.authRequireEmailVerification;
|
||||
conf.auth.requireOrganization = appConfiguration?.authRequireOrganization;
|
||||
conf.auth.requireName = appConfiguration?.authRequireName;
|
||||
// Captcha (mCaptcha) is env-driven (MCAPTCHA_*), not stored per-tenant in the DB.
|
||||
// Captcha is env-driven, not stored per-tenant in the DB.
|
||||
// `conf.auth.captcha` is already populated from webConfig in the default builder.
|
||||
|
||||
conf.analytics.enabled = appConfiguration?.analyticsEnabled;
|
||||
|
||||
Reference in new issue
Block a user