feat(sso): refactor SSO provider update logic

- Changed the update mechanism for SSO providers to use a new `updateSSOProvider` function, improving code clarity and maintainability.
- Updated the payload structure for OIDC and SAML configurations to directly use the input values instead of stringifying them.
- Enhanced the overall handling of SSO provider updates within the API router.
This commit is contained in:
Mauricio Siu
2026-02-13 00:15:05 -06:00
parent edbc98aea7
commit 2788323e01
5 changed files with 60 additions and 33 deletions
@@ -4,7 +4,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { Plus, Trash2 } from "lucide-react"; import { Plus, Trash2 } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import type { FieldArrayPath } from "react-hook-form"; import type { FieldArrayPath } from "react-hook-form";
import { useFieldArray, useForm } from "react-hook-form"; import { useFieldArray, useForm, useWatch } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod"; import { z } from "zod";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -28,6 +28,7 @@ import {
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { useUrl } from "@/utils/hooks/use-url";
const DEFAULT_SCOPES = ["openid", "email", "profile"]; const DEFAULT_SCOPES = ["openid", "email", "profile"];
@@ -120,6 +121,14 @@ export function RegisterOidcDialog({
defaultValues: formDefaultValues, defaultValues: formDefaultValues,
}); });
const watchedProviderId = useWatch({
control: form.control,
name: "providerId",
defaultValue: "",
});
const baseURL = useUrl();
useEffect(() => { useEffect(() => {
if (!data || !open) return; if (!data || !open) return;
const domains = data.domain const domains = data.domain
@@ -242,6 +251,17 @@ export function RegisterOidcDialog({
Unique identifier; used in callback URL path. Unique identifier; used in callback URL path.
{isEdit && " Cannot be changed when editing."} {isEdit && " Cannot be changed when editing."}
</FormDescription> </FormDescription>
{baseURL && (
<div className="rounded-md bg-muted px-3 py-2 text-xs">
<p className="font-medium text-muted-foreground">
Callback URL (configure in your IdP)
</p>
<p className="mt-0.5 break-all font-mono">
{baseURL}/api/auth/sso/callback/
{watchedProviderId?.trim() || "..."}
</p>
</div>
)}
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}
@@ -3,7 +3,12 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Plus, Trash2 } from "lucide-react"; import { Plus, Trash2 } from "lucide-react";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { type FieldArrayPath, useFieldArray, useForm } from "react-hook-form"; import {
type FieldArrayPath,
useFieldArray,
useForm,
useWatch,
} from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
import { z } from "zod"; import { z } from "zod";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -28,6 +33,7 @@ import {
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea"; import { Textarea } from "@/components/ui/textarea";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { useUrl } from "@/utils/hooks/use-url";
const domainsArraySchema = z const domainsArraySchema = z
.array(z.string().trim()) .array(z.string().trim())
@@ -115,13 +121,7 @@ export function RegisterSamlDialog({
? updateMutation.isLoading ? updateMutation.isLoading
: registerMutation.isLoading; : registerMutation.isLoading;
const [baseURL, setBaseURL] = useState(""); const baseURL = useUrl();
useEffect(() => {
if (typeof window !== "undefined") {
setBaseURL(window.location.origin);
}
}, []);
const form = useForm<SamlProviderForm>({ const form = useForm<SamlProviderForm>({
resolver: zodResolver(samlProviderSchema), resolver: zodResolver(samlProviderSchema),
@@ -148,6 +148,12 @@ export function RegisterSamlDialog({
}); });
}, [data, open, form]); }, [data, open, form]);
const watchedProviderId = useWatch({
control: form.control,
name: "providerId",
defaultValue: "",
});
const { fields, append, remove } = useFieldArray({ const { fields, append, remove } = useFieldArray({
control: form.control, control: form.control,
name: "domains" as FieldArrayPath<SamlProviderForm>, name: "domains" as FieldArrayPath<SamlProviderForm>,
@@ -243,6 +249,17 @@ export function RegisterSamlDialog({
Cannot be changed when editing. Cannot be changed when editing.
</FormDescription> </FormDescription>
)} )}
{baseURL && (
<div className="rounded-md bg-muted px-3 py-2 text-xs">
<p className="font-medium text-muted-foreground">
Callback URL (configure in your IdP)
</p>
<p className="mt-0.5 break-all font-mono">
{baseURL}/api/auth/sso/saml2/callback/
{watchedProviderId?.trim() || "..."}
</p>
</div>
)}
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}
@@ -9,7 +9,7 @@ import {
Shield, Shield,
Trash2, Trash2,
} from "lucide-react"; } from "lucide-react";
import { useEffect, useState } from "react"; import { useState } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { DialogAction } from "@/components/shared/dialog-action"; import { DialogAction } from "@/components/shared/dialog-action";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
@@ -31,6 +31,7 @@ import {
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { api } from "@/utils/api"; import { api } from "@/utils/api";
import { useUrl } from "@/utils/hooks/use-url";
import { RegisterOidcDialog } from "./register-oidc-dialog"; import { RegisterOidcDialog } from "./register-oidc-dialog";
import { RegisterSamlDialog } from "./register-saml-dialog"; import { RegisterSamlDialog } from "./register-saml-dialog";
@@ -76,18 +77,12 @@ export const SSOSettings = () => {
const utils = api.useUtils(); const utils = api.useUtils();
const [detailsProvider, setDetailsProvider] = const [detailsProvider, setDetailsProvider] =
useState<ProviderForDetails | null>(null); useState<ProviderForDetails | null>(null);
const [baseURL, setBaseURL] = useState(""); const baseURL = useUrl();
const [manageOriginsOpen, setManageOriginsOpen] = useState(false); const [manageOriginsOpen, setManageOriginsOpen] = useState(false);
const [editingOrigin, setEditingOrigin] = useState<string | null>(null); const [editingOrigin, setEditingOrigin] = useState<string | null>(null);
const [editingValue, setEditingValue] = useState(""); const [editingValue, setEditingValue] = useState("");
const [newOriginInput, setNewOriginInput] = useState(""); const [newOriginInput, setNewOriginInput] = useState("");
useEffect(() => {
if (typeof window !== "undefined") {
setBaseURL(window.location.origin);
}
}, []);
const { data: providers, isLoading } = api.sso.listProviders.useQuery(); const { data: providers, isLoading } = api.sso.listProviders.useQuery();
const { data: userData } = api.user.get.useQuery(undefined, { const { data: userData } = api.user.get.useQuery(undefined, {
enabled: manageOriginsOpen, enabled: manageOriginsOpen,
@@ -154,33 +154,27 @@ export const ssoRouter = createTRPCRouter({
} }
const domain = input.domains.join(","); const domain = input.domains.join(",");
const updateBody: {
const updatePayload: {
issuer: string; issuer: string;
domain: string; domain: string;
oidcConfig?: string; oidcConfig?: (typeof input)["oidcConfig"];
samlConfig?: string; samlConfig?: (typeof input)["samlConfig"];
} = { } = {
issuer: input.issuer, issuer: input.issuer,
domain, domain,
}; };
if (input.oidcConfig != null) { if (input.oidcConfig != null) {
updatePayload.oidcConfig = JSON.stringify(input.oidcConfig); updateBody.oidcConfig = input.oidcConfig;
} }
if (input.samlConfig != null) { if (input.samlConfig != null) {
updatePayload.samlConfig = JSON.stringify(input.samlConfig); updateBody.samlConfig = input.samlConfig;
} }
await db await auth.updateSSOProvider({
.update(ssoProvider) params: { providerId: input.providerId },
.set(updatePayload) body: updateBody,
.where( headers: requestToHeaders(ctx.req),
and( });
eq(ssoProvider.providerId, input.providerId),
eq(ssoProvider.organizationId, ctx.session.activeOrganizationId),
eq(ssoProvider.userId, ctx.session.userId),
),
);
return { success: true }; return { success: true };
}), }),
deleteProvider: enterpriseProcedure deleteProvider: enterpriseProcedure
+1
View File
@@ -349,6 +349,7 @@ export const auth = {
handler, handler,
createApiKey: api.createApiKey, createApiKey: api.createApiKey,
registerSSOProvider: api.registerSSOProvider, registerSSOProvider: api.registerSSOProvider,
updateSSOProvider: api.updateSSOProvider,
}; };
export const validateRequest = async (request: IncomingMessage) => { export const validateRequest = async (request: IncomingMessage) => {