@fougere/auth-better 0.17.3-alpha.0 → 0.18.0-alpha.0
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/entity/authEntities.d.ts +2 -2
- package/dist/entity/authEntities.d.ts.map +1 -1
- package/dist/entity/authEntities.js +2 -3
- package/dist/entity/authEntities.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
- package/src/entity/authEntities.ts +4 -9
- package/src/index.ts +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type SchemaView } from '@fougere/schema';
|
|
2
|
-
export declare function authEntities(User:
|
|
1
|
+
import { type Entity, type SchemaView } from '@fougere/schema';
|
|
2
|
+
export declare function authEntities(User: Entity): {
|
|
3
3
|
AuthSession: SchemaView;
|
|
4
4
|
AuthAccount: SchemaView;
|
|
5
5
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authEntities.d.ts","sourceRoot":"","sources":["../../src/entity/authEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"authEntities.d.ts","sourceRoot":"","sources":["../../src/entity/authEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEpH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG;IAC1C,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,UAAU,CAAC;CACzB,CAqCA"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { entity, primary, text, date, created, ref, optional } from '@fougere/schema';
|
|
2
2
|
export function authEntities(User) {
|
|
3
|
-
const target = User;
|
|
4
3
|
/**
|
|
5
4
|
* Session entity — better-auth shape.
|
|
6
5
|
* `token` carries the opaque session secret (cookie value).
|
|
7
6
|
*/
|
|
8
7
|
class Session extends entity({
|
|
9
8
|
id: primary(),
|
|
10
|
-
userId: ref(
|
|
9
|
+
userId: ref(User),
|
|
11
10
|
token: text(),
|
|
12
11
|
expiresAt: date(),
|
|
13
12
|
ipAddress: optional(text()),
|
|
@@ -24,7 +23,7 @@ export function authEntities(User) {
|
|
|
24
23
|
id: primary(),
|
|
25
24
|
accountId: text(),
|
|
26
25
|
providerId: text(),
|
|
27
|
-
userId: ref(
|
|
26
|
+
userId: ref(User),
|
|
28
27
|
accessToken: optional(text()),
|
|
29
28
|
refreshToken: optional(text()),
|
|
30
29
|
idToken: optional(text()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authEntities.js","sourceRoot":"","sources":["../../src/entity/authEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"authEntities.js","sourceRoot":"","sources":["../../src/entity/authEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAgC,MAAM,iBAAiB,CAAC;AAEpH,MAAM,UAAU,YAAY,CAAC,IAAY;IAIvC;;;OAGG;IACH,MAAM,OAAQ,SAAQ,MAAM,CAAC;QAC3B,EAAE,EAAE,OAAO,EAAE;QACb,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;QACjB,KAAK,EAAE,IAAI,EAAE;QACb,SAAS,EAAE,IAAI,EAAE;QACjB,SAAS,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,SAAS,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,SAAS,EAAE,OAAO,EAAE;QACpB,SAAS,EAAE,OAAO,EAAE;KACrB,CAAC;KAAG;IAEL;;;OAGG;IACH,MAAM,OAAQ,SAAQ,MAAM,CAAC;QAC3B,EAAE,EAAE,OAAO,EAAE;QACb,SAAS,EAAE,IAAI,EAAE;QACjB,UAAU,EAAE,IAAI,EAAE;QAClB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;QACjB,WAAW,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC7B,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzB,oBAAoB,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,qBAAqB,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvC,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC1B,SAAS,EAAE,OAAO,EAAE;QACpB,SAAS,EAAE,OAAO,EAAE;KACrB,CAAC;KAAG;IAEL,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;AACxD,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { type FrondDescriptor } from '@fougere/core';
|
|
2
|
-
import { type SchemaView } from '@fougere/schema';
|
|
2
|
+
import { type Entity, type SchemaView } from '@fougere/schema';
|
|
3
3
|
import { type FougereProviders } from './FougereProviders.js';
|
|
4
4
|
export { AuthUser } from './entity/AuthUser.js';
|
|
5
5
|
/** What `fronds: { '@fougere/auth-better': { … } }` hands the factory in fougere.config.ts. */
|
|
6
6
|
export interface BetterAuthOptions {
|
|
7
|
-
user?:
|
|
7
|
+
user?: Entity;
|
|
8
8
|
secret: string;
|
|
9
9
|
baseUrl?: string;
|
|
10
10
|
basePath?: string;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2C,KAAK,eAAe,EAAgB,MAAM,eAAe,CAAC;AAC5G,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2C,KAAK,eAAe,EAAgB,MAAM,eAAe,CAAC;AAC5G,OAAO,EAAoB,KAAK,MAAM,EAAe,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK9F,OAAO,EAA0D,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEtH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,+FAA+F;AAC/F,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,OAAO,CAAC,EAAE,UAAU,CAAC;IACrB,YAAY,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,eAAe,CAqCnE;eAEc,UAAU"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAkE,MAAM,eAAe,CAAC;AAC5G,OAAO,EAAE,IAAI,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fougere/auth-better",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.0-alpha.0",
|
|
4
4
|
"description": "Fougere's auth — a translation layer onto better-auth.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"fougere",
|
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
"src"
|
|
30
30
|
],
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@fougere/core": "0.
|
|
33
|
-
"@fougere/schema": "0.
|
|
32
|
+
"@fougere/core": "0.18.0-alpha.0",
|
|
33
|
+
"@fougere/schema": "0.18.0-alpha.0",
|
|
34
34
|
"@paralleldrive/cuid2": "^3.3.0",
|
|
35
35
|
"better-auth": "^1.6.11"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@fougere/adapter-sql": "0.
|
|
38
|
+
"@fougere/adapter-sql": "0.18.0-alpha.0",
|
|
39
39
|
"vitest": "^4.1.0"
|
|
40
40
|
},
|
|
41
41
|
"publishConfig": {
|
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
import { entity, primary, text, date, created, ref, optional, type SchemaView } from '@fougere/schema';
|
|
1
|
+
import { entity, primary, text, date, created, ref, optional, type Entity, type SchemaView } from '@fougere/schema';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
type LiveEntity = abstract new (...args: any[]) => unknown;
|
|
5
|
-
|
|
6
|
-
export function authEntities(User: SchemaView): {
|
|
3
|
+
export function authEntities(User: Entity): {
|
|
7
4
|
AuthSession: SchemaView;
|
|
8
5
|
AuthAccount: SchemaView;
|
|
9
6
|
} {
|
|
10
|
-
const target = User as unknown as LiveEntity;
|
|
11
|
-
|
|
12
7
|
/**
|
|
13
8
|
* Session entity — better-auth shape.
|
|
14
9
|
* `token` carries the opaque session secret (cookie value).
|
|
15
10
|
*/
|
|
16
11
|
class Session extends entity({
|
|
17
12
|
id: primary(),
|
|
18
|
-
userId: ref(
|
|
13
|
+
userId: ref(User),
|
|
19
14
|
token: text(),
|
|
20
15
|
expiresAt: date(),
|
|
21
16
|
ipAddress: optional(text()),
|
|
@@ -32,7 +27,7 @@ export function authEntities(User: SchemaView): {
|
|
|
32
27
|
id: primary(),
|
|
33
28
|
accountId: text(),
|
|
34
29
|
providerId: text(),
|
|
35
|
-
userId: ref(
|
|
30
|
+
userId: ref(User),
|
|
36
31
|
accessToken: optional(text()),
|
|
37
32
|
refreshToken: optional(text()),
|
|
38
33
|
idToken: optional(text()),
|
package/src/index.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { betterAuth as betterAuthLib } from 'better-auth';
|
|
2
2
|
import { createId } from '@paralleldrive/cuid2';
|
|
3
3
|
import { AUTH, frond, type App, type AuthRuntime, type FrondDescriptor, type Storage } from '@fougere/core';
|
|
4
|
-
import { json, lowerFirst, type Schema, type SchemaView } from '@fougere/schema';
|
|
4
|
+
import { json, lowerFirst, type Entity, type Schema, type SchemaView } from '@fougere/schema';
|
|
5
5
|
import { AuthUser } from './entity/AuthUser.js';
|
|
6
6
|
import { AuthVerification } from './entity/AuthVerification.js';
|
|
7
7
|
import { authEntities } from './entity/authEntities.js';
|
|
@@ -12,7 +12,7 @@ export { AuthUser } from './entity/AuthUser.js';
|
|
|
12
12
|
|
|
13
13
|
/** What `fronds: { '@fougere/auth-better': { … } }` hands the factory in fougere.config.ts. */
|
|
14
14
|
export interface BetterAuthOptions {
|
|
15
|
-
user?:
|
|
15
|
+
user?: Entity;
|
|
16
16
|
secret: string;
|
|
17
17
|
baseUrl?: string;
|
|
18
18
|
basePath?: string;
|