@delmaredigital/payload-better-auth 0.3.2 → 0.3.3
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.
package/dist/exports/client.d.ts
CHANGED
|
@@ -113,13 +113,13 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
113
113
|
token: string | null;
|
|
114
114
|
user: {
|
|
115
115
|
id: string;
|
|
116
|
-
email: string;
|
|
117
|
-
name: string;
|
|
118
|
-
image: string | null | undefined;
|
|
119
|
-
emailVerified: boolean;
|
|
120
116
|
createdAt: Date;
|
|
121
117
|
updatedAt: Date;
|
|
122
|
-
|
|
118
|
+
email: string;
|
|
119
|
+
emailVerified: boolean;
|
|
120
|
+
name: string;
|
|
121
|
+
image?: string | null | undefined;
|
|
122
|
+
} & Record<string, any>;
|
|
123
123
|
}, {
|
|
124
124
|
code?: string | undefined;
|
|
125
125
|
message?: string | undefined;
|
|
@@ -252,13 +252,13 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
252
252
|
query?: Record<string, any> | undefined;
|
|
253
253
|
fetchOptions?: FetchOptions | undefined;
|
|
254
254
|
}> | undefined, data_1?: FetchOptions | undefined) => Promise<import("better-auth/react").BetterFetchResponse<{
|
|
255
|
+
scopes: string[];
|
|
255
256
|
id: string;
|
|
256
|
-
providerId: string;
|
|
257
257
|
createdAt: Date;
|
|
258
258
|
updatedAt: Date;
|
|
259
|
-
accountId: string;
|
|
260
259
|
userId: string;
|
|
261
|
-
|
|
260
|
+
providerId: string;
|
|
261
|
+
accountId: string;
|
|
262
262
|
}[], {
|
|
263
263
|
code?: string | undefined;
|
|
264
264
|
message?: string | undefined;
|
|
@@ -403,15 +403,15 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
403
403
|
fetchOptions?: FetchOptions | undefined;
|
|
404
404
|
}>, data_1?: FetchOptions | undefined) => Promise<import("better-auth/react").BetterFetchResponse<{
|
|
405
405
|
token: string | undefined;
|
|
406
|
-
user: {
|
|
406
|
+
user: (Record<string, any> & {
|
|
407
407
|
id: string;
|
|
408
|
+
createdAt: Date;
|
|
409
|
+
updatedAt: Date;
|
|
408
410
|
email: string;
|
|
409
411
|
emailVerified: boolean;
|
|
410
412
|
name: string;
|
|
411
|
-
image
|
|
412
|
-
|
|
413
|
-
updatedAt: Date;
|
|
414
|
-
};
|
|
413
|
+
image?: string | null | undefined;
|
|
414
|
+
}) | import("better-auth/plugins").UserWithTwoFactor;
|
|
415
415
|
}, {
|
|
416
416
|
code?: string | undefined;
|
|
417
417
|
message?: string | undefined;
|
|
@@ -457,18 +457,21 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
457
457
|
trustDevice?: boolean | undefined;
|
|
458
458
|
} & {
|
|
459
459
|
fetchOptions?: FetchOptions | undefined;
|
|
460
|
-
}>, data_1?: FetchOptions | undefined) => Promise<import("better-auth/react").BetterFetchResponse<{
|
|
460
|
+
}>, data_1?: FetchOptions | undefined) => Promise<import("better-auth/react").BetterFetchResponse<NonNullable<{
|
|
461
461
|
token: string;
|
|
462
|
-
user:
|
|
462
|
+
user: import("better-auth/plugins").UserWithTwoFactor;
|
|
463
|
+
} | {
|
|
464
|
+
token: string;
|
|
465
|
+
user: Record<string, any> & {
|
|
463
466
|
id: string;
|
|
467
|
+
createdAt: Date;
|
|
468
|
+
updatedAt: Date;
|
|
464
469
|
email: string;
|
|
465
470
|
emailVerified: boolean;
|
|
466
471
|
name: string;
|
|
467
|
-
image
|
|
468
|
-
createdAt: Date;
|
|
469
|
-
updatedAt: Date;
|
|
472
|
+
image?: string | null | undefined;
|
|
470
473
|
};
|
|
471
|
-
}
|
|
474
|
+
}>, {
|
|
472
475
|
code?: string | undefined;
|
|
473
476
|
message?: string | undefined;
|
|
474
477
|
}, FetchOptions["throw"] extends true ? true : false>>;
|
|
@@ -498,18 +501,21 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
498
501
|
trustDevice?: boolean | undefined;
|
|
499
502
|
} & {
|
|
500
503
|
fetchOptions?: FetchOptions | undefined;
|
|
501
|
-
}>, data_1?: FetchOptions | undefined) => Promise<import("better-auth/react").BetterFetchResponse<{
|
|
504
|
+
}>, data_1?: FetchOptions | undefined) => Promise<import("better-auth/react").BetterFetchResponse<NonNullable<{
|
|
502
505
|
token: string;
|
|
503
|
-
user:
|
|
506
|
+
user: import("better-auth/plugins").UserWithTwoFactor;
|
|
507
|
+
} | {
|
|
508
|
+
token: string;
|
|
509
|
+
user: Record<string, any> & {
|
|
504
510
|
id: string;
|
|
511
|
+
createdAt: Date;
|
|
512
|
+
updatedAt: Date;
|
|
505
513
|
email: string;
|
|
506
514
|
emailVerified: boolean;
|
|
507
515
|
name: string;
|
|
508
|
-
image
|
|
509
|
-
createdAt: Date;
|
|
510
|
-
updatedAt: Date;
|
|
516
|
+
image?: string | null | undefined;
|
|
511
517
|
};
|
|
512
|
-
}
|
|
518
|
+
}>, {
|
|
513
519
|
code?: string | undefined;
|
|
514
520
|
message?: string | undefined;
|
|
515
521
|
}, FetchOptions["throw"] extends true ? true : false>>;
|
|
@@ -1154,6 +1160,7 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
1154
1160
|
})[];
|
|
1155
1161
|
cache?: RequestCache | undefined;
|
|
1156
1162
|
method: string;
|
|
1163
|
+
window?: null | undefined;
|
|
1157
1164
|
headers?: (HeadersInit & (HeadersInit | {
|
|
1158
1165
|
accept: "application/json" | "text/plain" | "application/octet-stream";
|
|
1159
1166
|
"content-type": "application/json" | "text/plain" | "application/x-www-form-urlencoded" | "multipart/form-data" | "application/octet-stream";
|
|
@@ -1168,7 +1175,6 @@ export declare function createPayloadAuthClient(options?: PayloadAuthClientOptio
|
|
|
1168
1175
|
referrer?: string | undefined;
|
|
1169
1176
|
referrerPolicy?: ReferrerPolicy | undefined;
|
|
1170
1177
|
signal?: (AbortSignal | null) | undefined;
|
|
1171
|
-
window?: null | undefined;
|
|
1172
1178
|
onRetry?: ((response: import("better-auth/react").ResponseContext) => Promise<void> | void) | undefined;
|
|
1173
1179
|
hookOptions?: {
|
|
1174
1180
|
cloneResponse?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,CAAC,EAAE,wBAAwB;;;;;;6BAdxC,CAAC;iBAAa,CAAC
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,CAAC,EAAE,wBAAwB;;;;;;6BAdxC,CAAC;iBAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsBgo8F,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAAn7tF,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA6xL,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAAk0G,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAAt+H,CAAC;yBAA8C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAAtgW,CAAC;oBAAoB,CAAC;wBAA+B,CAAC;8BAAiD,CAAC;;;uBAAoG,CAAC;;;;;;;;;;;;;;;;;;;;;yBAAoe,CAAC;wBAAwB,CAAC;gBAAwJ,CAAC;mCAA8M,CAAC;2BAA8N,CAAC;gCAAyC,CAAC;;;uBAAoG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAA1uE,CAAC;iBAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAAi4C,CAAC;;cAA0D,CAAC;eAA+B,CAAC;;;;;gBAA8U,CAAC;mBAA8C,CAAC;iBAAmC,CAAC;iBAAmC,CAAC;YAA+B,CAAC;gBAAuC,CAAC;gBAA2C,CAAC;sBAAwC,CAAC;cAAwC,CAAC;eAA+C,CAAC;mBAA0G,CAAC;yBAAuB,CAAC;;eAAyC,CAAC;;;aAA2G,CAAC;YAA+B,CAAC;;;;;;;;;;;;YAA+e,CAAC;aAAgB,CAAC;cAAiB,CAAC;cAAiB,CAAC;;aAA8F,CAAC;oBAAkE,CAAC;cAAgC,CAAC;mBAAmG,CAAC;yBAA2E,CAAC;qBAAwC,CAAC;;;uBAAkF,CAAC;+GAAuL,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAH1wI;AAED,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA"}
|
package/dist/plugin/index.d.ts
CHANGED
|
@@ -137,15 +137,26 @@ export declare function createBetterAuthPlugin(options: BetterAuthPluginOptions)
|
|
|
137
137
|
export type BetterAuthStrategyOptions = {
|
|
138
138
|
/**
|
|
139
139
|
* The collection slug for users
|
|
140
|
-
*
|
|
140
|
+
* @default 'users'
|
|
141
141
|
*/
|
|
142
142
|
usersCollection?: string;
|
|
143
|
+
/**
|
|
144
|
+
* The collection slug for organization members (used for organization role lookup)
|
|
145
|
+
* @default 'members'
|
|
146
|
+
*/
|
|
147
|
+
membersCollection?: string;
|
|
143
148
|
};
|
|
144
149
|
/**
|
|
145
150
|
* Payload auth strategy that uses Better Auth for authentication.
|
|
146
151
|
*
|
|
147
152
|
* Use this in your Users collection to authenticate via Better Auth sessions.
|
|
148
153
|
*
|
|
154
|
+
* Session fields (like `activeOrganizationId` from the organization plugin) are
|
|
155
|
+
* automatically merged onto `req.user`, making them available in access control functions.
|
|
156
|
+
*
|
|
157
|
+
* If an active organization is set, the user's role in that organization is also
|
|
158
|
+
* fetched and available as `req.user.organizationRole`.
|
|
159
|
+
*
|
|
149
160
|
* @example
|
|
150
161
|
* ```ts
|
|
151
162
|
* import { betterAuthStrategy } from '@delmaredigital/payload-better-auth/plugin'
|
|
@@ -159,6 +170,17 @@ export type BetterAuthStrategyOptions = {
|
|
|
159
170
|
* // ...
|
|
160
171
|
* }
|
|
161
172
|
* ```
|
|
173
|
+
*
|
|
174
|
+
* @example Access control with organization data
|
|
175
|
+
* ```ts
|
|
176
|
+
* // In your access control:
|
|
177
|
+
* export const orgReadAccess: Access = ({ req }) => {
|
|
178
|
+
* if (!req.user?.activeOrganizationId) return false
|
|
179
|
+
* return {
|
|
180
|
+
* organization: { equals: req.user.activeOrganizationId }
|
|
181
|
+
* }
|
|
182
|
+
* }
|
|
183
|
+
* ```
|
|
162
184
|
*/
|
|
163
185
|
export declare function betterAuthStrategy(options?: BetterAuthStrategyOptions): AuthStrategy;
|
|
164
186
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EAEZ,WAAW,EAIZ,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAMhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAE5D,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;AAGhD,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;AAE/D,MAAM,MAAM,4BAA4B,GAAG;IACzC,8CAA8C;IAC9C,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,qDAAqD;IACrD,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,+BAA+B;IAC/B,KAAK,CAAC,EAAE;QACN,kCAAkC;QAClC,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,iEAAiE;QACjE,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB;;;;;WAKG;QACH,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QACvC;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAA;QACzB,+DAA+D;QAC/D,aAAa,CAAC,EAAE,OAAO,CAAA;KACxB,CAAA;IACD,iEAAiE;IACjE,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,+DAA+D;IAC/D,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAC9C,wCAAwC;IACxC,eAAe,CAAC,EAAE;QAChB,uEAAuE;QACvE,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,mEAAmE;QACnE,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,mEAAmE;QACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IACD;;;;OAIG;IACH,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;OAGG;IACH,UAAU,EAAE,kBAAkB,CAAA;IAE9B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAE/B;;;OAGG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAA;IAEnC;;OAEG;IACH,KAAK,CAAC,EAAE,4BAA4B,CAAA;CACrC,CAAA;AAQD;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,kBAAkB,GAAG,SAAS,CAEtE;AA4PD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,MAAM,CAiER;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EAEZ,WAAW,EAIZ,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAMhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAE5D,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;AAGhD,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;AAE/D,MAAM,MAAM,4BAA4B,GAAG;IACzC,8CAA8C;IAC9C,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,qDAAqD;IACrD,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,2CAA2C;IAC3C,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,+BAA+B;IAC/B,KAAK,CAAC,EAAE;QACN,kCAAkC;QAClC,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,iEAAiE;QACjE,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB;;;;;WAKG;QACH,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QACvC;;;WAGG;QACH,eAAe,CAAC,EAAE,OAAO,CAAA;QACzB,+DAA+D;QAC/D,aAAa,CAAC,EAAE,OAAO,CAAA;KACxB,CAAA;IACD,iEAAiE;IACjE,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,+DAA+D;IAC/D,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,8DAA8D;IAC9D,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAE3B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAC9C,wCAAwC;IACxC,eAAe,CAAC,EAAE;QAChB,uEAAuE;QACvE,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,mEAAmE;QACnE,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,mEAAmE;QACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,CAAA;IACD;;;;OAIG;IACH,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;OAGG;IACH,UAAU,EAAE,kBAAkB,CAAA;IAE9B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAE/B;;;OAGG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAA;IAEnC;;OAEG;IACH,KAAK,CAAC,EAAE,4BAA4B,CAAA;CACrC,CAAA;AAQD;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,kBAAkB,GAAG,SAAS,CAEtE;AA4PD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,MAAM,CAiER;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,yBAA8B,GACtC,YAAY,CAsFd;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAExC"}
|
package/dist/plugin/index.js
CHANGED
|
@@ -306,6 +306,12 @@ export function createBetterAuthPlugin(options) {
|
|
|
306
306
|
*
|
|
307
307
|
* Use this in your Users collection to authenticate via Better Auth sessions.
|
|
308
308
|
*
|
|
309
|
+
* Session fields (like `activeOrganizationId` from the organization plugin) are
|
|
310
|
+
* automatically merged onto `req.user`, making them available in access control functions.
|
|
311
|
+
*
|
|
312
|
+
* If an active organization is set, the user's role in that organization is also
|
|
313
|
+
* fetched and available as `req.user.organizationRole`.
|
|
314
|
+
*
|
|
309
315
|
* @example
|
|
310
316
|
* ```ts
|
|
311
317
|
* import { betterAuthStrategy } from '@delmaredigital/payload-better-auth/plugin'
|
|
@@ -319,9 +325,20 @@ export function createBetterAuthPlugin(options) {
|
|
|
319
325
|
* // ...
|
|
320
326
|
* }
|
|
321
327
|
* ```
|
|
328
|
+
*
|
|
329
|
+
* @example Access control with organization data
|
|
330
|
+
* ```ts
|
|
331
|
+
* // In your access control:
|
|
332
|
+
* export const orgReadAccess: Access = ({ req }) => {
|
|
333
|
+
* if (!req.user?.activeOrganizationId) return false
|
|
334
|
+
* return {
|
|
335
|
+
* organization: { equals: req.user.activeOrganizationId }
|
|
336
|
+
* }
|
|
337
|
+
* }
|
|
338
|
+
* ```
|
|
322
339
|
*/
|
|
323
340
|
export function betterAuthStrategy(options = {}) {
|
|
324
|
-
const { usersCollection = 'users' } = options;
|
|
341
|
+
const { usersCollection = 'users', membersCollection = 'members' } = options;
|
|
325
342
|
return {
|
|
326
343
|
name: 'better-auth',
|
|
327
344
|
authenticate: async ({ payload, headers, }) => {
|
|
@@ -332,22 +349,50 @@ export function betterAuthStrategy(options = {}) {
|
|
|
332
349
|
console.error('Better Auth not initialized on payload instance');
|
|
333
350
|
return { user: null };
|
|
334
351
|
}
|
|
335
|
-
const
|
|
336
|
-
if (!
|
|
352
|
+
const sessionData = await auth.api.getSession({ headers });
|
|
353
|
+
if (!sessionData?.user?.id) {
|
|
337
354
|
return { user: null };
|
|
338
355
|
}
|
|
339
356
|
const users = await payload.find({
|
|
340
357
|
collection: usersCollection,
|
|
341
|
-
where: { id: { equals:
|
|
358
|
+
where: { id: { equals: sessionData.user.id } },
|
|
342
359
|
limit: 1,
|
|
343
360
|
depth: 0,
|
|
344
361
|
});
|
|
345
362
|
if (users.docs.length === 0) {
|
|
346
363
|
return { user: null };
|
|
347
364
|
}
|
|
365
|
+
// Extract session fields to merge onto user (e.g., activeOrganizationId from org plugin)
|
|
366
|
+
// Exclude fields that might conflict with user fields
|
|
367
|
+
const { id: _sessionId, userId: _userId, expiresAt: _expiresAt, token: _token, ...sessionFields } = sessionData.session || {};
|
|
368
|
+
// If there's an active organization, fetch the user's role in that org
|
|
369
|
+
let organizationRole;
|
|
370
|
+
if (sessionFields.activeOrganizationId) {
|
|
371
|
+
try {
|
|
372
|
+
const memberships = await payload.find({
|
|
373
|
+
collection: membersCollection,
|
|
374
|
+
where: {
|
|
375
|
+
and: [
|
|
376
|
+
{ user: { equals: sessionData.user.id } },
|
|
377
|
+
{ organization: { equals: sessionFields.activeOrganizationId } },
|
|
378
|
+
],
|
|
379
|
+
},
|
|
380
|
+
limit: 1,
|
|
381
|
+
depth: 0,
|
|
382
|
+
});
|
|
383
|
+
if (memberships.docs.length > 0) {
|
|
384
|
+
organizationRole = memberships.docs[0].role;
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
catch {
|
|
388
|
+
// Members collection might not exist (org plugin not used), silently ignore
|
|
389
|
+
}
|
|
390
|
+
}
|
|
348
391
|
return {
|
|
349
392
|
user: {
|
|
350
393
|
...users.docs[0],
|
|
394
|
+
...sessionFields, // Merge session fields (activeOrganizationId, etc.)
|
|
395
|
+
...(organizationRole && { organizationRole }), // Add org role if found
|
|
351
396
|
collection: usersCollection,
|
|
352
397
|
_strategy: 'better-auth',
|
|
353
398
|
},
|
package/dist/plugin/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@delmaredigital/payload-better-auth",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.3",
|
|
4
4
|
"description": "Better Auth adapter and plugins for Payload CMS",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"prepublishOnly": "pnpm build"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@better-auth/passkey": "^1.4.
|
|
66
|
+
"@better-auth/passkey": "^1.4.17"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
69
|
"@payloadcms/next": ">=3.69.0",
|
|
@@ -74,14 +74,14 @@
|
|
|
74
74
|
"react": ">=19.2.1"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
|
-
"@payloadcms/next": "^3.
|
|
78
|
-
"@payloadcms/ui": "^3.
|
|
79
|
-
"@types/node": "^25.0.
|
|
80
|
-
"@types/react": "^19.2.
|
|
77
|
+
"@payloadcms/next": "^3.73.0",
|
|
78
|
+
"@payloadcms/ui": "^3.73.0",
|
|
79
|
+
"@types/node": "^25.0.10",
|
|
80
|
+
"@types/react": "^19.2.9",
|
|
81
81
|
"@vitest/coverage-v8": "^2.1.9",
|
|
82
|
-
"better-auth": "^1.4.
|
|
83
|
-
"next": "^16.1.
|
|
84
|
-
"payload": "^3.
|
|
82
|
+
"better-auth": "^1.4.17",
|
|
83
|
+
"next": "^16.1.4",
|
|
84
|
+
"payload": "^3.73.0",
|
|
85
85
|
"react": "^19.2.3",
|
|
86
86
|
"tsx": "^4.21.0",
|
|
87
87
|
"typescript": "^5.9.3",
|