Apply feedback

dust-tt · Jan 2, 2025 · 5c1a305 · 5c1a305
1 parent 2f833cb
commit 5c1a305
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/front/lib/api/user.ts b/front/lib/api/user.ts
@@ -2,6 +2,7 @@ import type {
   Result,
   UserMetadataType,
   UserType,
+  UserTypeWithExtensionWorkspaces,
   UserTypeWithWorkspaces,
 } from "@dust-tt/types";
 import { Err, Ok } from "@dust-tt/types";
@@ -142,7 +143,7 @@ export async function fetchRevokedWorkspace(
 export async function getUserWithWorkspaces(
   user: UserResource,
   populateExtensionConfig = false
-): Promise<UserTypeWithWorkspaces> {
+): Promise<UserTypeWithWorkspaces | UserTypeWithExtensionWorkspaces> {
   const { memberships } = await MembershipResource.getActiveMemberships({
     users: [user],
   });
@@ -170,9 +171,11 @@ export async function getUserWithWorkspaces(
         segmentation: w.segmentation || null,
         whiteListedProviders: w.whiteListedProviders,
         defaultEmbeddingProvider: w.defaultEmbeddingProvider,
-        extensionBlacklistedDomains:
-          configs.find((c) => c.workspaceId === w.id)?.blacklistedDomains ??
-          undefined,
+        ...(populateExtensionConfig && {
+          blacklistedDomains:
+            configs.find((c) => c.workspaceId === w.id)?.blacklistedDomains ??
+            null,
+        }),
       };
     }),
   };

diff --git a/sdks/js/src/types.ts b/sdks/js/src/types.ts
@@ -691,7 +691,10 @@ export type LightWorkspaceType = z.infer<typeof LightWorkspaceSchema>;
 
 const WorkspaceSchema = LightWorkspaceSchema.extend({
   ssoEnforced: z.boolean().optional(),
-  extensionBlacklistedDomains: z.array(z.string()).optional(),
+});
+
+const ExtensionWorkspaceSchema = WorkspaceSchema.extend({
+  blacklistedDomains: z.array(z.string()).optional(),
 });
 
 const UserProviderSchema = FlexibleEnumSchema<
@@ -2200,7 +2203,11 @@ export type FileUploadedRequestResponseType = z.infer<
 >;
 
 export const MeResponseSchema = z.object({
-  user: UserSchema.and(z.object({ workspaces: WorkspaceSchema.array() })),
+  user: UserSchema.and(
+    z.object({
+      workspaces: WorkspaceSchema.array().or(ExtensionWorkspaceSchema.array()),
+    })
+  ),
 });
 
 export type MeResponseType = z.infer<typeof MeResponseSchema>;

diff --git a/types/src/front/user.ts b/types/src/front/user.ts
@@ -44,7 +44,10 @@ export type LightWorkspaceType = {
 
 export type WorkspaceType = LightWorkspaceType & {
   ssoEnforced?: boolean;
-  extensionBlacklistedDomains?: string[];
+};
+
+export type ExtensionWorkspaceType = WorkspaceType & {
+  blacklistedDomains?: string[];
 };
 
 export type UserProviderType =
@@ -73,6 +76,10 @@ export type UserTypeWithWorkspaces = UserType & {
   workspaces: WorkspaceType[];
 };
 
+export type UserTypeWithExtensionWorkspaces = UserType & {
+  workspaces: ExtensionWorkspaceType[];
+};
+
 export type UserMetadataType = {
   key: string;
   value: string;