From 43fc358b5037b012943b89a5834282fd6ea91bdc Mon Sep 17 00:00:00 2001
From: Christina Papadogianni <59121443+ChrisPdgn@users.noreply.github.com>
Date: Thu, 3 Sep 2026 11:30:11 +0000
Subject: [PATCH 1/2] feat(chat): add invitation redirect URI fields

Wire Chat admin settings to explicit_room_joins.redirect
from Conduit #1512 so login/accept/decline URIs can be
configured without treating {roomId} as an invalid URL.

Co-authored-by: Christina Papadogianni <ChrisPdgn@users.noreply.github.com>
---
 src/components/chat/settings/settings.tsx     | 24 ++++-
 src/components/chat/settings/settingsForm.tsx | 94 +++++++++++++++++++
 src/lib/models/chat/settings.ts               |  5 +
 3 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/src/components/chat/settings/settings.tsx b/src/components/chat/settings/settings.tsx
index 78f81edbe..883311081 100644
--- a/src/components/chat/settings/settings.tsx
+++ b/src/components/chat/settings/settings.tsx
@@ -33,6 +33,13 @@ const FormSchema = z.object({
     enabled: z.boolean(),
     send_email: z.boolean(),
     send_notification: z.boolean(),
+    redirect: z
+      .object({
+        login_uri: z.string().optional().default(''),
+        accept_uri: z.string().optional().default(''),
+        decline_uri: z.string().optional().default(''),
+      })
+      .optional(),
   }),
 });
 
@@ -52,7 +59,18 @@ export const Settings = ({
   const { save, isSaving } = useSettingsSave('Chat');
   const form = useForm<z.infer<typeof FormSchema>>({
     resolver: rhfZodResolver(FormSchema),
-    defaultValues: data,
+    defaultValues: {
+      ...data,
+      explicit_room_joins: {
+        ...data.explicit_room_joins,
+        redirect: {
+          login_uri: '',
+          accept_uri: '',
+          decline_uri: '',
+          ...(data.explicit_room_joins?.redirect ?? {}),
+        },
+      },
+    },
   });
 
   useEffect(() => {
@@ -73,7 +91,9 @@ export const Settings = ({
   const handleSwitchChange = () => {
     addAlert({
       title: 'Chat Module',
-      description: `Are you sure you want to ${chatModule ? 'disable' : 'enable'} Chat module?`,
+      description: `Are you sure you want to ${
+        chatModule ? 'disable' : 'enable'
+      } Chat module?`,
       cancelText: 'Cancel',
       actionText: 'Proceed',
       onDecision: cancel => {
diff --git a/src/components/chat/settings/settingsForm.tsx b/src/components/chat/settings/settingsForm.tsx
index f2200b567..e657d7a11 100644
--- a/src/components/chat/settings/settingsForm.tsx
+++ b/src/components/chat/settings/settingsForm.tsx
@@ -1,10 +1,12 @@
 import {
   FormControl,
+  FormDescription,
   FormField,
   FormItem,
   FormLabel,
   FormMessage,
 } from '@/components/ui/form';
+import { Input } from '@/components/ui/input';
 import { Switch } from '@/components/ui/switch';
 import { useFormContext, useWatch } from 'react-hook-form';
 import { cn } from '@/lib/utils';
@@ -180,6 +182,98 @@ export const SettingsForm = ({
             />
           </>
         </div>
+        <div className="flex flex-col gap-4 border-t pt-4">
+          <h3
+            className={cn(
+              'text-lg font-medium',
+              !explicitJoin && disabledStyling
+            )}
+          >
+            Invitation Redirects
+          </h3>
+          <div className="grid grid-cols-1 gap-4">
+            <FormField
+              control={formRef.control}
+              name="explicit_room_joins.redirect.login_uri"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className={cn(!explicitJoin && disabledStyling)}>
+                    Login Redirect URI
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      disabled={!explicitJoin || !edit}
+                      placeholder="https://example.com/login"
+                      {...field}
+                      value={field.value ?? ''}
+                    />
+                  </FormControl>
+                  <FormDescription
+                    className={cn(!explicitJoin && disabledStyling)}
+                  >
+                    Absolute login page URL for unauthenticated email-link
+                    clicks. Hook appends
+                    ?redirectUri=...&answer=...&invitationToken=... Empty means
+                    email clicks fail until configured.
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={formRef.control}
+              name="explicit_room_joins.redirect.accept_uri"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className={cn(!explicitJoin && disabledStyling)}>
+                    Accept Redirect URI
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      disabled={!explicitJoin || !edit}
+                      placeholder="https://example.com/chat/{roomId}"
+                      {...field}
+                      value={field.value ?? ''}
+                    />
+                  </FormControl>
+                  <FormDescription
+                    className={cn(!explicitJoin && disabledStyling)}
+                  >
+                    Post-accept destination. Supports {'{roomId}'} placeholder.
+                    If empty, returns a JSON result.
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={formRef.control}
+              name="explicit_room_joins.redirect.decline_uri"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className={cn(!explicitJoin && disabledStyling)}>
+                    Decline Redirect URI
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      disabled={!explicitJoin || !edit}
+                      placeholder="https://example.com/dashboard"
+                      {...field}
+                      value={field.value ?? ''}
+                    />
+                  </FormControl>
+                  <FormDescription
+                    className={cn(!explicitJoin && disabledStyling)}
+                  >
+                    Post-decline destination. Supports {'{roomId}'} placeholder.
+                    If empty, returns a JSON result.
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+        </div>
       </div>
       <SettingsFormActions
         edit={edit}
diff --git a/src/lib/models/chat/settings.ts b/src/lib/models/chat/settings.ts
index 810824bde..724be737f 100644
--- a/src/lib/models/chat/settings.ts
+++ b/src/lib/models/chat/settings.ts
@@ -8,5 +8,10 @@ export type ChatSettings = {
     enabled: boolean;
     send_email: boolean;
     send_notification: boolean;
+    redirect: {
+      login_uri: string;
+      accept_uri: string;
+      decline_uri: string;
+    };
   };
 };

From 70737de4583c3cc99700964d276228b40658dc00 Mon Sep 17 00:00:00 2001
From: Christina Papadogianni <59121443+ChrisPdgn@users.noreply.github.com>
Date: Thu, 3 Sep 2026 11:32:44 +0000
Subject: [PATCH 2/2] fix(chat): keep invitation redirect defaults type-safe

Use equivalent empty-string fallbacks so TypeScript does not
see overwritten keys, and default the optional redirect object
so submit stays assignable to ChatSettings.
---
 src/components/chat/settings/settings.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/chat/settings/settings.tsx b/src/components/chat/settings/settings.tsx
index 883311081..68cc77828 100644
--- a/src/components/chat/settings/settings.tsx
+++ b/src/components/chat/settings/settings.tsx
@@ -39,7 +39,12 @@ const FormSchema = z.object({
         accept_uri: z.string().optional().default(''),
         decline_uri: z.string().optional().default(''),
       })
-      .optional(),
+      .optional()
+      .default({
+        login_uri: '',
+        accept_uri: '',
+        decline_uri: '',
+      }),
   }),
 });
 
@@ -64,10 +69,9 @@ export const Settings = ({
       explicit_room_joins: {
         ...data.explicit_room_joins,
         redirect: {
-          login_uri: '',
-          accept_uri: '',
-          decline_uri: '',
-          ...(data.explicit_room_joins?.redirect ?? {}),
+          login_uri: data.explicit_room_joins?.redirect?.login_uri ?? '',
+          accept_uri: data.explicit_room_joins?.redirect?.accept_uri ?? '',
+          decline_uri: data.explicit_room_joins?.redirect?.decline_uri ?? '',
         },
       },
     },