@librechat/data-schemas 0.0.47 → 0.0.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. package/dist/admin/capabilities.cjs +14 -0
  2. package/dist/admin/capabilities.cjs.map +1 -1
  3. package/dist/admin/capabilities.es.js +14 -1
  4. package/dist/admin/capabilities.es.js.map +1 -1
  5. package/dist/app/resolution.cjs +56 -1
  6. package/dist/app/resolution.cjs.map +1 -1
  7. package/dist/app/resolution.es.js +56 -1
  8. package/dist/app/resolution.es.js.map +1 -1
  9. package/dist/config/tenantContext.cjs +13 -0
  10. package/dist/config/tenantContext.cjs.map +1 -1
  11. package/dist/config/tenantContext.es.js +13 -1
  12. package/dist/config/tenantContext.es.js.map +1 -1
  13. package/dist/index.cjs +4 -0
  14. package/dist/index.cjs.map +1 -1
  15. package/dist/index.es.js +3 -2
  16. package/dist/index.es.js.map +1 -1
  17. package/dist/methods/aclEntry.cjs +2 -1
  18. package/dist/methods/aclEntry.cjs.map +1 -1
  19. package/dist/methods/aclEntry.es.js +2 -1
  20. package/dist/methods/aclEntry.es.js.map +1 -1
  21. package/dist/methods/agentCategory.cjs +4 -2
  22. package/dist/methods/agentCategory.cjs.map +1 -1
  23. package/dist/methods/agentCategory.es.js +4 -2
  24. package/dist/methods/agentCategory.es.js.map +1 -1
  25. package/dist/methods/conversation.cjs +3 -2
  26. package/dist/methods/conversation.cjs.map +1 -1
  27. package/dist/methods/conversation.es.js +3 -2
  28. package/dist/methods/conversation.es.js.map +1 -1
  29. package/dist/methods/conversationTag.cjs +3 -2
  30. package/dist/methods/conversationTag.cjs.map +1 -1
  31. package/dist/methods/conversationTag.es.js +3 -2
  32. package/dist/methods/conversationTag.es.js.map +1 -1
  33. package/dist/methods/file.cjs +2 -1
  34. package/dist/methods/file.cjs.map +1 -1
  35. package/dist/methods/file.es.js +2 -1
  36. package/dist/methods/file.es.js.map +1 -1
  37. package/dist/methods/message.cjs +2 -1
  38. package/dist/methods/message.cjs.map +1 -1
  39. package/dist/methods/message.es.js +2 -1
  40. package/dist/methods/message.es.js.map +1 -1
  41. package/dist/methods/prompt.cjs +25 -5
  42. package/dist/methods/prompt.cjs.map +1 -1
  43. package/dist/methods/prompt.es.js +25 -5
  44. package/dist/methods/prompt.es.js.map +1 -1
  45. package/dist/methods/role.cjs.map +1 -1
  46. package/dist/methods/role.es.js.map +1 -1
  47. package/dist/methods/systemGrant.cjs +148 -29
  48. package/dist/methods/systemGrant.cjs.map +1 -1
  49. package/dist/methods/systemGrant.es.js +148 -29
  50. package/dist/methods/systemGrant.es.js.map +1 -1
  51. package/dist/methods/tx.cjs.map +1 -1
  52. package/dist/methods/tx.es.js.map +1 -1
  53. package/dist/methods/user.cjs +11 -4
  54. package/dist/methods/user.cjs.map +1 -1
  55. package/dist/methods/user.es.js +11 -4
  56. package/dist/methods/user.es.js.map +1 -1
  57. package/dist/methods/userGroup.cjs +1 -3
  58. package/dist/methods/userGroup.cjs.map +1 -1
  59. package/dist/methods/userGroup.es.js +1 -3
  60. package/dist/methods/userGroup.es.js.map +1 -1
  61. package/dist/migrations/promptGroupIndexes.cjs.map +1 -1
  62. package/dist/migrations/promptGroupIndexes.es.js.map +1 -1
  63. package/dist/migrations/tenantIndexes.cjs +4 -2
  64. package/dist/migrations/tenantIndexes.cjs.map +1 -1
  65. package/dist/migrations/tenantIndexes.es.js +4 -2
  66. package/dist/migrations/tenantIndexes.es.js.map +1 -1
  67. package/dist/schema/agent.cjs +1 -2
  68. package/dist/schema/agent.cjs.map +1 -1
  69. package/dist/schema/agent.es.js +1 -2
  70. package/dist/schema/agent.es.js.map +1 -1
  71. package/dist/schema/convo.cjs +0 -1
  72. package/dist/schema/convo.cjs.map +1 -1
  73. package/dist/schema/convo.es.js +0 -1
  74. package/dist/schema/convo.es.js.map +1 -1
  75. package/dist/schema/message.cjs +0 -1
  76. package/dist/schema/message.cjs.map +1 -1
  77. package/dist/schema/message.es.js +0 -1
  78. package/dist/schema/message.es.js.map +1 -1
  79. package/dist/schema/preset.cjs +1 -1
  80. package/dist/schema/preset.cjs.map +1 -1
  81. package/dist/schema/preset.es.js +1 -1
  82. package/dist/schema/preset.es.js.map +1 -1
  83. package/dist/schema/systemGrant.cjs +2 -4
  84. package/dist/schema/systemGrant.cjs.map +1 -1
  85. package/dist/schema/systemGrant.es.js +3 -5
  86. package/dist/schema/systemGrant.es.js.map +1 -1
  87. package/dist/types/admin/capabilities.d.ts +5 -0
  88. package/dist/types/config/tenantContext.d.ts +6 -0
  89. package/dist/types/index.d.ts +1 -1
  90. package/dist/types/methods/aclEntry.d.ts +2 -2
  91. package/dist/types/methods/systemGrant.d.ts +29 -1
  92. package/dist/types/methods/tx.d.ts +1 -1
  93. package/dist/types/methods/user.d.ts +5 -1
  94. package/dist/types/methods/userGroup.d.ts +1 -1
  95. package/dist/types/schema/user.d.ts +2 -2
  96. package/dist/types/types/admin.d.ts +16 -3
  97. package/dist/types/types/user.d.ts +9 -0
  98. package/dist/types/utils/index.d.ts +1 -0
  99. package/dist/types/utils/tenantBulkWrite.d.ts +45 -0
  100. package/dist/utils/tenantBulkWrite.cjs +85 -0
  101. package/dist/utils/tenantBulkWrite.cjs.map +1 -0
  102. package/dist/utils/tenantBulkWrite.es.js +83 -0
  103. package/dist/utils/tenantBulkWrite.es.js.map +1 -0
  104. package/package.json +1 -1
@@ -1,10 +1,7 @@
1
1
  import { Schema } from 'mongoose';
2
2
  import { PrincipalType } from 'librechat-data-provider';
3
- import { SystemCapabilities } from '../admin/capabilities.es.js';
3
+ import { isValidCapability } from '../admin/capabilities.es.js';
4
4
 
5
- const baseCapabilities = new Set(Object.values(SystemCapabilities));
6
- const sectionCapPattern = /^(?:manage|read):configs:\w+$/;
7
- const assignCapPattern = /^assign:configs:(?:user|group|role)$/;
8
5
  const systemGrantSchema = new Schema({
9
6
  principalType: {
10
7
  type: String,
@@ -19,7 +16,7 @@ const systemGrantSchema = new Schema({
19
16
  type: String,
20
17
  required: true,
21
18
  validate: {
22
- validator: (v) => baseCapabilities.has(v) || sectionCapPattern.test(v) || assignCapPattern.test(v),
19
+ validator: isValidCapability,
23
20
  message: 'Invalid capability string: "{VALUE}"',
24
21
  },
25
22
  },
@@ -59,6 +56,7 @@ const systemGrantSchema = new Schema({
59
56
  */
60
57
  systemGrantSchema.index({ principalType: 1, principalId: 1, capability: 1, tenantId: 1 }, { unique: true });
61
58
  systemGrantSchema.index({ capability: 1, tenantId: 1 });
59
+ systemGrantSchema.index({ principalType: 1, capability: 1, tenantId: 1 });
62
60
 
63
61
  export { systemGrantSchema as default };
64
62
  //# sourceMappingURL=systemGrant.es.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"systemGrant.es.js","sources":["../../src/schema/systemGrant.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAMA,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAmB,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACrF,MAAM,iBAAiB,GAAG,+BAA+B;AACzD,MAAM,gBAAgB,GAAG,sCAAsC;AAE/D,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAClC;AACE,IAAA,aAAa,EAAE;AACb,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;AAClC,QAAA,QAAQ,EAAE,IAAI;AACf,KAAA;AACD,IAAA,WAAW,EAAE;AACX,QAAA,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK;AACxB,QAAA,QAAQ,EAAE,IAAI;AACf,KAAA;AACD,IAAA,UAAU,EAAE;AACV,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,QAAQ,EAAE;YACR,SAAS,EAAE,CAAC,CAAmB,KAC7B,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAClF,YAAA,OAAO,EAAE,sCAAsC;AAChD,SAAA;AACF,KAAA;AACD;;;;;AAKG;AACH,IAAA,QAAQ,EAAE;AACR,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,QAAQ,EAAE;AACR,YAAA,SAAS,EAAE,CAAC,CAAU,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;AACjD,YAAA,OAAO,EAAE,+EAA+E;AACzF,SAAA;AACF,KAAA;AACD,IAAA,SAAS,EAAE;AACT,QAAA,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;AAC3B,QAAA,GAAG,EAAE,MAAM;AACZ,KAAA;AACD,IAAA,SAAS,EAAE;AACT,QAAA,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,GAAG;AAClB,KAAA;;AAED,IAAA,SAAS,EAAE;AACT,QAAA,IAAI,EAAE,IAAI;AACV,QAAA,QAAQ,EAAE,KAAK;AAChB,KAAA;AACF,CAAA,EACD,EAAE,UAAU,EAAE,IAAI,EAAE;AAGtB;;;;;AAKG;AAEH,iBAAiB,CAAC,KAAK,CACrB,EAAE,aAAa,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAChE,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;AAED,iBAAiB,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;;;;"}
1
+ {"version":3,"file":"systemGrant.es.js","sources":["../../src/schema/systemGrant.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAKA,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAClC;AACE,IAAA,aAAa,EAAE;AACb,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;AAClC,QAAA,QAAQ,EAAE,IAAI;AACf,KAAA;AACD,IAAA,WAAW,EAAE;AACX,QAAA,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK;AACxB,QAAA,QAAQ,EAAE,IAAI;AACf,KAAA;AACD,IAAA,UAAU,EAAE;AACV,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,QAAQ,EAAE;AACR,YAAA,SAAS,EAAE,iBAAiB;AAC5B,YAAA,OAAO,EAAE,sCAAsC;AAChD,SAAA;AACF,KAAA;AACD;;;;;AAKG;AACH,IAAA,QAAQ,EAAE;AACR,QAAA,IAAI,EAAE,MAAM;AACZ,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,QAAQ,EAAE;AACR,YAAA,SAAS,EAAE,CAAC,CAAU,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;AACjD,YAAA,OAAO,EAAE,+EAA+E;AACzF,SAAA;AACF,KAAA;AACD,IAAA,SAAS,EAAE;AACT,QAAA,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;AAC3B,QAAA,GAAG,EAAE,MAAM;AACZ,KAAA;AACD,IAAA,SAAS,EAAE;AACT,QAAA,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,GAAG;AAClB,KAAA;;AAED,IAAA,SAAS,EAAE;AACT,QAAA,IAAI,EAAE,IAAI;AACV,QAAA,QAAQ,EAAE,KAAK;AAChB,KAAA;AACF,CAAA,EACD,EAAE,UAAU,EAAE,IAAI,EAAE;AAGtB;;;;;AAKG;AAEH,iBAAiB,CAAC,KAAK,CACrB,EAAE,aAAa,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAChE,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;AAED,iBAAiB,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;AACvD,iBAAiB,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;;;;"}
@@ -34,6 +34,11 @@ export declare const SystemCapabilities: {
34
34
  * e.g. `MANAGE_USERS` implies `READ_USERS`.
35
35
  */
36
36
  export declare const CapabilityImplications: Partial<Record<BaseSystemCapability, BaseSystemCapability[]>>;
37
+ /**
38
+ * Runtime validator for the full `SystemCapability` union:
39
+ * base capabilities, section-level config capabilities, and config assignment capabilities.
40
+ */
41
+ export declare function isValidCapability(value: string): boolean;
37
42
  /**
38
43
  * Check whether a set of held capabilities satisfies a required capability,
39
44
  * accounting for the manage→read implication hierarchy.
@@ -18,3 +18,9 @@ export declare function getTenantId(): string | undefined;
18
18
  * The callback MUST be async — sync callbacks returning Mongoose thenables will lose context.
19
19
  */
20
20
  export declare function runAsSystem<T>(fn: () => Promise<T>): Promise<T>;
21
+ /**
22
+ * Appends `:${tenantId}` to a cache key when a non-system tenant context is active.
23
+ * Returns the base key unchanged when no ALS context is set or when running
24
+ * inside `runAsSystem()` (SYSTEM_TENANT_ID context).
25
+ */
26
+ export declare function scopedCacheKey(baseKey: string): string;
@@ -10,6 +10,6 @@ export type * from './types';
10
10
  export type * from './methods';
11
11
  export { default as logger } from './config/winston';
12
12
  export { default as meiliLogger } from './config/meiliLogger';
13
- export { tenantStorage, getTenantId, runAsSystem, SYSTEM_TENANT_ID } from './config/tenantContext';
13
+ export { tenantStorage, getTenantId, runAsSystem, scopedCacheKey, SYSTEM_TENANT_ID, } from './config/tenantContext';
14
14
  export type { TenantContext } from './config/tenantContext';
15
15
  export { dropSupersededTenantIndexes, dropSupersededPromptGroupIndexes } from './migrations';
@@ -25,7 +25,7 @@
25
25
  /// <reference types="mongoose/types/inferrawdoctype" />
26
26
  import { Types } from 'mongoose';
27
27
  import type { AnyBulkWriteOperation, ClientSession, PipelineStage, DeleteResult } from 'mongoose';
28
- import type { IAclEntry } from '~/types';
28
+ import type { AclEntry, IAclEntry } from '~/types';
29
29
  export declare function createAclEntryMethods(mongoose: typeof import('mongoose')): {
30
30
  findEntriesByPrincipal: (principalType: string, principalId: string | Types.ObjectId, resourceType?: string) => Promise<IAclEntry[]>;
31
31
  findEntriesByResource: (resourceType: string, resourceId: string | Types.ObjectId) => Promise<IAclEntry[]>;
@@ -55,7 +55,7 @@ export declare function createAclEntryMethods(mongoose: typeof import('mongoose'
55
55
  deleteAclEntries: (filter: Record<string, unknown>, options?: {
56
56
  session?: ClientSession;
57
57
  }) => Promise<DeleteResult>;
58
- bulkWriteAclEntries: (ops: AnyBulkWriteOperation<IAclEntry>[], options?: {
58
+ bulkWriteAclEntries: (ops: AnyBulkWriteOperation<AclEntry>[], options?: {
59
59
  session?: ClientSession;
60
60
  }) => Promise<import("mongodb").BulkWriteResult>;
61
61
  findPublicResourceIds: (resourceType: string, requiredPermissions: number) => Promise<Types.ObjectId[]>;
@@ -50,11 +50,39 @@ export declare function createSystemGrantMethods(mongoose: typeof import('mongoo
50
50
  capability: SystemCapability;
51
51
  tenantId?: string | undefined;
52
52
  }) => Promise<boolean>;
53
+ getHeldCapabilities: ({ principals, capabilities, tenantId, }: {
54
+ principals: Array<{
55
+ principalType: PrincipalType;
56
+ principalId?: string | Types.ObjectId;
57
+ }>;
58
+ capabilities: SystemCapability[];
59
+ tenantId?: string | undefined;
60
+ }) => Promise<Set<SystemCapability>>;
61
+ listGrants: (options?: {
62
+ tenantId?: string;
63
+ principalTypes?: PrincipalType[];
64
+ limit?: number;
65
+ offset?: number;
66
+ }) => Promise<ISystemGrant[]>;
67
+ countGrants: (options?: {
68
+ tenantId?: string;
69
+ principalTypes?: PrincipalType[];
70
+ }) => Promise<number>;
53
71
  getCapabilitiesForPrincipal: ({ principalType, principalId, tenantId, }: {
54
72
  principalType: PrincipalType;
55
73
  principalId: string | Types.ObjectId;
56
74
  tenantId?: string | undefined;
57
75
  }) => Promise<ISystemGrant[]>;
58
- deleteGrantsForPrincipal: (principalType: PrincipalType, principalId: string | Types.ObjectId, session?: ClientSession) => Promise<void>;
76
+ getCapabilitiesForPrincipals: ({ principals, tenantId, }: {
77
+ principals: Array<{
78
+ principalType: PrincipalType;
79
+ principalId: string | Types.ObjectId;
80
+ }>;
81
+ tenantId?: string | undefined;
82
+ }) => Promise<ISystemGrant[]>;
83
+ deleteGrantsForPrincipal: (principalType: PrincipalType, principalId: string | Types.ObjectId, options?: {
84
+ tenantId?: string;
85
+ session?: ClientSession;
86
+ }) => Promise<void>;
59
87
  };
60
88
  export type SystemGrantMethods = ReturnType<typeof createSystemGrantMethods>;
@@ -91,7 +91,7 @@ export declare function createTxMethods(_mongoose: typeof import('mongoose'), tx
91
91
  inputTokenCount?: number | undefined;
92
92
  endpointTokenConfig?: Record<string, Record<string, number>> | undefined;
93
93
  }) => number;
94
- getPremiumRate: (valueKey: string, tokenType: string, inputTokenCount?: number) => number | null;
94
+ getPremiumRate: (valueKey: string, tokenType: string, inputTokenCount?: number | null) => number | null;
95
95
  getCacheMultiplier: ({ valueKey, cacheType, model, endpoint, endpointTokenConfig, }: {
96
96
  valueKey?: string | undefined;
97
97
  cacheType?: "read" | "write" | undefined;
@@ -30,7 +30,11 @@ export declare const DEFAULT_SESSION_EXPIRY: number;
30
30
  /** Factory function that takes mongoose instance and returns the methods */
31
31
  export declare function createUserMethods(mongoose: typeof import('mongoose')): {
32
32
  findUser: (searchCriteria: FilterQuery<IUser>, fieldsToSelect?: string | string[] | null) => Promise<IUser | null>;
33
- findUsers: (searchCriteria: FilterQuery<IUser>, fieldsToSelect?: string | string[] | null) => Promise<IUser[]>;
33
+ findUsers: (searchCriteria: FilterQuery<IUser>, fieldsToSelect?: string | string[] | null, options?: {
34
+ limit?: number;
35
+ offset?: number;
36
+ sort?: Record<string, 1 | -1>;
37
+ }) => Promise<IUser[]>;
34
38
  countUsers: (filter?: FilterQuery<IUser>) => Promise<number>;
35
39
  createUser: (data: CreateUserRequest, balanceConfig?: BalanceConfig, disableTTL?: boolean, returnUser?: boolean) => Promise<mongoose.Types.ObjectId | Partial<IUser>>;
36
40
  updateUser: (userId: string, updateData: Partial<IUser>) => Promise<IUser | null>;
@@ -54,7 +54,7 @@ export declare function createUserGroupMethods(mongoose: typeof import('mongoose
54
54
  userId: string | Types.ObjectId;
55
55
  role?: string | null;
56
56
  }, session?: ClientSession) => Promise<Array<{
57
- principalType: string;
57
+ principalType: PrincipalType;
58
58
  principalId?: string | Types.ObjectId;
59
59
  }>>;
60
60
  syncUserEntraGroups: (userId: string | Types.ObjectId, entraGroups: Array<{
@@ -26,11 +26,11 @@
26
26
  import { Schema } from 'mongoose';
27
27
  import { IUser } from '~/types';
28
28
  declare const userSchema: Schema<IUser, import("mongoose").Model<IUser, any, any, any, import("mongoose").Document<unknown, any, IUser> & IUser & Required<{
29
- _id: unknown;
29
+ _id: import("mongoose").Types.ObjectId;
30
30
  }> & {
31
31
  __v: number;
32
32
  }, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IUser, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IUser>> & import("mongoose").FlatRecord<IUser> & Required<{
33
- _id: unknown;
33
+ _id: import("mongoose").Types.ObjectId;
34
34
  }> & {
35
35
  __v: number;
36
36
  }>;
@@ -1,11 +1,11 @@
1
- import type { PrincipalType, PrincipalModel, TCustomConfig, z, configSchema } from 'librechat-data-provider';
1
+ import type { PrincipalType, PrincipalModel, TCustomConfig } from 'librechat-data-provider';
2
2
  import type { SystemCapabilities } from '~/admin/capabilities';
3
3
  /** Base capabilities derived from the SystemCapabilities constant. */
4
4
  export type BaseSystemCapability = (typeof SystemCapabilities)[keyof typeof SystemCapabilities];
5
5
  /** Principal types that can receive config overrides. */
6
6
  export type ConfigAssignTarget = 'user' | 'group' | 'role';
7
7
  /** Top-level keys of the configSchema from librechat.yaml. */
8
- export type ConfigSection = keyof z.infer<typeof configSchema>;
8
+ export type ConfigSection = string & keyof TCustomConfig;
9
9
  /** Section-level config capabilities derived from configSchema keys. */
10
10
  type ConfigSectionCapability = `manage:configs:${ConfigSection}` | `read:configs:${ConfigSection}`;
11
11
  /** Principal-scoped config assignment capabilities. */
@@ -89,11 +89,24 @@ export type AdminMember = {
89
89
  avatarUrl?: string;
90
90
  joinedAt?: string;
91
91
  };
92
+ /** Full user info returned by the admin user list endpoint. */
93
+ export type AdminUserListItem = {
94
+ id: string;
95
+ name: string;
96
+ username: string;
97
+ email: string;
98
+ avatar: string;
99
+ role: string;
100
+ provider: string;
101
+ createdAt?: string;
102
+ updatedAt?: string;
103
+ };
92
104
  /** Minimal user info returned by user search endpoints. */
93
105
  export type AdminUserSearchResult = {
94
- userId: string;
106
+ id: string;
95
107
  name: string;
96
108
  email: string;
109
+ username?: string;
97
110
  avatarUrl?: string;
98
111
  };
99
112
  export {};
@@ -26,6 +26,7 @@
26
26
  import type { Document, Types } from 'mongoose';
27
27
  import { CursorPaginationParams } from '~/common';
28
28
  export interface IUser extends Document {
29
+ _id: Types.ObjectId;
29
30
  name?: string;
30
31
  username?: string;
31
32
  email: string;
@@ -74,6 +75,14 @@ export interface IUser extends Document {
74
75
  /** Field for external source identification (for consistency with TPrincipal schema) */
75
76
  idOnTheSource?: string;
76
77
  tenantId?: string;
78
+ federatedTokens?: OIDCTokens;
79
+ openidTokens?: OIDCTokens;
80
+ }
81
+ export interface OIDCTokens {
82
+ access_token?: string;
83
+ id_token?: string;
84
+ refresh_token?: string;
85
+ expires_at?: number;
77
86
  }
78
87
  export interface BalanceConfig {
79
88
  enabled?: boolean;
@@ -1,5 +1,6 @@
1
1
  export * from './principal';
2
2
  export * from './string';
3
3
  export * from './tempChatRetention';
4
+ export { tenantSafeBulkWrite } from './tenantBulkWrite';
4
5
  export * from './transactions';
5
6
  export * from './objectId';
@@ -0,0 +1,45 @@
1
+ /// <reference types="mongoose/types/aggregate" />
2
+ /// <reference types="mongoose/types/callback" />
3
+ /// <reference types="mongoose/types/collection" />
4
+ /// <reference types="mongoose/types/connection" />
5
+ /// <reference types="mongoose/types/cursor" />
6
+ /// <reference types="mongoose/types/document" />
7
+ /// <reference types="mongoose/types/error" />
8
+ /// <reference types="mongoose/types/expressions" />
9
+ /// <reference types="mongoose/types/helpers" />
10
+ /// <reference types="mongoose/types/middlewares" />
11
+ /// <reference types="mongoose/types/indexes" />
12
+ /// <reference types="mongoose/types/models" />
13
+ /// <reference types="mongoose/types/mongooseoptions" />
14
+ /// <reference types="mongoose/types/pipelinestage" />
15
+ /// <reference types="mongoose/types/populate" />
16
+ /// <reference types="mongoose/types/query" />
17
+ /// <reference types="mongoose/types/schemaoptions" />
18
+ /// <reference types="mongoose/types/schematypes" />
19
+ /// <reference types="mongoose/types/session" />
20
+ /// <reference types="mongoose/types/types" />
21
+ /// <reference types="mongoose/types/utility" />
22
+ /// <reference types="mongoose/types/validation" />
23
+ /// <reference types="mongoose/types/virtuals" />
24
+ /// <reference types="mongoose/types/inferschematype" />
25
+ /// <reference types="mongoose/types/inferrawdoctype" />
26
+ import type { AnyBulkWriteOperation, Model, MongooseBulkWriteOptions } from 'mongoose';
27
+ import type { BulkWriteResult } from 'mongodb';
28
+ /** Resets the cached strict-mode flag. Exposed for test teardown only. */
29
+ export declare function _resetBulkWriteStrictCache(): void;
30
+ /**
31
+ * Tenant-safe wrapper around Mongoose `Model.bulkWrite()`.
32
+ *
33
+ * Mongoose's `bulkWrite` does not trigger schema-level middleware hooks, so the
34
+ * `applyTenantIsolation` plugin cannot intercept it. This wrapper injects the
35
+ * current ALS tenant context into every operation's filter and/or document
36
+ * before delegating to the native `bulkWrite`.
37
+ *
38
+ * Behavior:
39
+ * - **tenantId present** (normal request): injects `{ tenantId }` into every
40
+ * operation filter (updateOne, deleteOne, replaceOne) and document (insertOne).
41
+ * - **SYSTEM_TENANT_ID**: skips injection (cross-tenant system operation).
42
+ * - **No tenantId + strict mode**: throws (fail-closed, same as the plugin).
43
+ * - **No tenantId + non-strict**: passes through without injection (backward compat).
44
+ */
45
+ export declare function tenantSafeBulkWrite<T>(model: Model<T>, ops: AnyBulkWriteOperation[], options?: MongooseBulkWriteOptions): Promise<BulkWriteResult>;
@@ -0,0 +1,85 @@
1
+ 'use strict';
2
+
3
+ var tenantContext = require('../config/tenantContext.cjs');
4
+ var winston = require('../config/winston.cjs');
5
+
6
+ let _strictMode;
7
+ function isStrict() {
8
+ return (_strictMode !== null && _strictMode !== void 0 ? _strictMode : (_strictMode = process.env.TENANT_ISOLATION_STRICT === 'true'));
9
+ }
10
+ /**
11
+ * Tenant-safe wrapper around Mongoose `Model.bulkWrite()`.
12
+ *
13
+ * Mongoose's `bulkWrite` does not trigger schema-level middleware hooks, so the
14
+ * `applyTenantIsolation` plugin cannot intercept it. This wrapper injects the
15
+ * current ALS tenant context into every operation's filter and/or document
16
+ * before delegating to the native `bulkWrite`.
17
+ *
18
+ * Behavior:
19
+ * - **tenantId present** (normal request): injects `{ tenantId }` into every
20
+ * operation filter (updateOne, deleteOne, replaceOne) and document (insertOne).
21
+ * - **SYSTEM_TENANT_ID**: skips injection (cross-tenant system operation).
22
+ * - **No tenantId + strict mode**: throws (fail-closed, same as the plugin).
23
+ * - **No tenantId + non-strict**: passes through without injection (backward compat).
24
+ */
25
+ async function tenantSafeBulkWrite(model, ops, options) {
26
+ const tenantId = tenantContext.getTenantId();
27
+ if (!tenantId) {
28
+ if (isStrict()) {
29
+ throw new Error(`[TenantIsolation] bulkWrite on ${model.modelName} attempted without tenant context in strict mode`);
30
+ }
31
+ return model.bulkWrite(ops, options);
32
+ }
33
+ if (tenantId === tenantContext.SYSTEM_TENANT_ID) {
34
+ return model.bulkWrite(ops, options);
35
+ }
36
+ const injected = ops.map((op) => injectTenantId(op, tenantId));
37
+ return model.bulkWrite(injected, options);
38
+ }
39
+ /**
40
+ * Injects `tenantId` into a single bulk-write operation.
41
+ * Returns a new operation object — does not mutate the original.
42
+ */
43
+ function injectTenantId(op, tenantId) {
44
+ if ('insertOne' in op) {
45
+ return {
46
+ insertOne: {
47
+ document: { ...op.insertOne.document, tenantId },
48
+ },
49
+ };
50
+ }
51
+ if ('updateOne' in op) {
52
+ const { filter, ...rest } = op.updateOne;
53
+ return { updateOne: { ...rest, filter: { ...filter, tenantId } } };
54
+ }
55
+ if ('updateMany' in op) {
56
+ const { filter, ...rest } = op.updateMany;
57
+ return { updateMany: { ...rest, filter: { ...filter, tenantId } } };
58
+ }
59
+ if ('deleteOne' in op) {
60
+ const { filter, ...rest } = op.deleteOne;
61
+ return { deleteOne: { ...rest, filter: { ...filter, tenantId } } };
62
+ }
63
+ if ('deleteMany' in op) {
64
+ const { filter, ...rest } = op.deleteMany;
65
+ return { deleteMany: { ...rest, filter: { ...filter, tenantId } } };
66
+ }
67
+ if ('replaceOne' in op) {
68
+ const { filter, replacement, ...rest } = op.replaceOne;
69
+ return {
70
+ replaceOne: {
71
+ ...rest,
72
+ filter: { ...filter, tenantId },
73
+ replacement: { ...replacement, tenantId },
74
+ },
75
+ };
76
+ }
77
+ if (isStrict()) {
78
+ throw new Error('[TenantIsolation] Unknown bulkWrite operation type in strict mode — refusing to pass through without tenant injection');
79
+ }
80
+ winston.warn('[tenantSafeBulkWrite] Unknown bulk op type, passing through without tenant injection');
81
+ return op;
82
+ }
83
+
84
+ exports.tenantSafeBulkWrite = tenantSafeBulkWrite;
85
+ //# sourceMappingURL=tenantBulkWrite.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tenantBulkWrite.cjs","sources":["../../src/utils/tenantBulkWrite.ts"],"sourcesContent":[null],"names":["getTenantId","SYSTEM_TENANT_ID","logger"],"mappings":"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"}
@@ -0,0 +1,83 @@
1
+ import { getTenantId, SYSTEM_TENANT_ID } from '../config/tenantContext.es.js';
2
+ import logger from '../config/winston.es.js';
3
+
4
+ let _strictMode;
5
+ function isStrict() {
6
+ return (_strictMode !== null && _strictMode !== void 0 ? _strictMode : (_strictMode = process.env.TENANT_ISOLATION_STRICT === 'true'));
7
+ }
8
+ /**
9
+ * Tenant-safe wrapper around Mongoose `Model.bulkWrite()`.
10
+ *
11
+ * Mongoose's `bulkWrite` does not trigger schema-level middleware hooks, so the
12
+ * `applyTenantIsolation` plugin cannot intercept it. This wrapper injects the
13
+ * current ALS tenant context into every operation's filter and/or document
14
+ * before delegating to the native `bulkWrite`.
15
+ *
16
+ * Behavior:
17
+ * - **tenantId present** (normal request): injects `{ tenantId }` into every
18
+ * operation filter (updateOne, deleteOne, replaceOne) and document (insertOne).
19
+ * - **SYSTEM_TENANT_ID**: skips injection (cross-tenant system operation).
20
+ * - **No tenantId + strict mode**: throws (fail-closed, same as the plugin).
21
+ * - **No tenantId + non-strict**: passes through without injection (backward compat).
22
+ */
23
+ async function tenantSafeBulkWrite(model, ops, options) {
24
+ const tenantId = getTenantId();
25
+ if (!tenantId) {
26
+ if (isStrict()) {
27
+ throw new Error(`[TenantIsolation] bulkWrite on ${model.modelName} attempted without tenant context in strict mode`);
28
+ }
29
+ return model.bulkWrite(ops, options);
30
+ }
31
+ if (tenantId === SYSTEM_TENANT_ID) {
32
+ return model.bulkWrite(ops, options);
33
+ }
34
+ const injected = ops.map((op) => injectTenantId(op, tenantId));
35
+ return model.bulkWrite(injected, options);
36
+ }
37
+ /**
38
+ * Injects `tenantId` into a single bulk-write operation.
39
+ * Returns a new operation object — does not mutate the original.
40
+ */
41
+ function injectTenantId(op, tenantId) {
42
+ if ('insertOne' in op) {
43
+ return {
44
+ insertOne: {
45
+ document: { ...op.insertOne.document, tenantId },
46
+ },
47
+ };
48
+ }
49
+ if ('updateOne' in op) {
50
+ const { filter, ...rest } = op.updateOne;
51
+ return { updateOne: { ...rest, filter: { ...filter, tenantId } } };
52
+ }
53
+ if ('updateMany' in op) {
54
+ const { filter, ...rest } = op.updateMany;
55
+ return { updateMany: { ...rest, filter: { ...filter, tenantId } } };
56
+ }
57
+ if ('deleteOne' in op) {
58
+ const { filter, ...rest } = op.deleteOne;
59
+ return { deleteOne: { ...rest, filter: { ...filter, tenantId } } };
60
+ }
61
+ if ('deleteMany' in op) {
62
+ const { filter, ...rest } = op.deleteMany;
63
+ return { deleteMany: { ...rest, filter: { ...filter, tenantId } } };
64
+ }
65
+ if ('replaceOne' in op) {
66
+ const { filter, replacement, ...rest } = op.replaceOne;
67
+ return {
68
+ replaceOne: {
69
+ ...rest,
70
+ filter: { ...filter, tenantId },
71
+ replacement: { ...replacement, tenantId },
72
+ },
73
+ };
74
+ }
75
+ if (isStrict()) {
76
+ throw new Error('[TenantIsolation] Unknown bulkWrite operation type in strict mode — refusing to pass through without tenant injection');
77
+ }
78
+ logger.warn('[tenantSafeBulkWrite] Unknown bulk op type, passing through without tenant injection');
79
+ return op;
80
+ }
81
+
82
+ export { tenantSafeBulkWrite };
83
+ //# sourceMappingURL=tenantBulkWrite.es.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tenantBulkWrite.es.js","sources":["../../src/utils/tenantBulkWrite.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@librechat/data-schemas",
3
- "version": "0.0.47",
3
+ "version": "0.0.48",
4
4
  "description": "Mongoose schemas and models for LibreChat",
5
5
  "type": "module",
6
6
  "main": "dist/index.cjs",