@voyantjs/auth 0.26.0 → 0.26.2
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/workspace.d.ts +2 -1
- package/dist/workspace.d.ts.map +1 -1
- package/dist/workspace.js +12 -3
- package/dist/workspace.js.map +1 -1
- package/package.json +3 -3
package/dist/workspace.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ import type { getDb } from "@voyantjs/db";
|
|
|
2
2
|
type WorkspaceDb = ReturnType<typeof getDb>;
|
|
3
3
|
export type CurrentUser = {
|
|
4
4
|
id: string;
|
|
5
|
-
email: string;
|
|
5
|
+
email: string | null;
|
|
6
|
+
phoneNumber?: string | null;
|
|
6
7
|
firstName: string | null;
|
|
7
8
|
lastName: string | null;
|
|
8
9
|
isSuperAdmin: boolean;
|
package/dist/workspace.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAIzC,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAA;AAE3C,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAIzC,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAA;AAE3C,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,OAAO,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,OAAO,CAAA;IACnB,aAAa,EAAE,OAAO,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAsB,cAAc,CAClC,EAAE,EAAE,WAAW,EACf,KAAK,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACxB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAiC7B;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,CAoDrB"}
|
package/dist/workspace.js
CHANGED
|
@@ -5,6 +5,7 @@ export async function getCurrentUser(db, input) {
|
|
|
5
5
|
.select({
|
|
6
6
|
id: authUser.id,
|
|
7
7
|
email: authUser.email,
|
|
8
|
+
phoneNumber: authUser.phoneNumber,
|
|
8
9
|
createdAt: authUser.createdAt,
|
|
9
10
|
firstName: userProfilesTable.firstName,
|
|
10
11
|
lastName: userProfilesTable.lastName,
|
|
@@ -22,6 +23,7 @@ export async function getCurrentUser(db, input) {
|
|
|
22
23
|
return {
|
|
23
24
|
id: row.id,
|
|
24
25
|
email: row.email,
|
|
26
|
+
phoneNumber: row.phoneNumber ?? null,
|
|
25
27
|
firstName: row.firstName ?? null,
|
|
26
28
|
lastName: row.lastName ?? null,
|
|
27
29
|
isSuperAdmin: row.isSuperAdmin ?? false,
|
|
@@ -41,15 +43,22 @@ export async function ensureCurrentUserProfile(db, userId) {
|
|
|
41
43
|
return { userExists: true, authenticated: true };
|
|
42
44
|
}
|
|
43
45
|
const [user] = await db
|
|
44
|
-
.select({
|
|
46
|
+
.select({
|
|
47
|
+
name: authUser.name,
|
|
48
|
+
email: authUser.email,
|
|
49
|
+
phoneNumber: authUser.phoneNumber,
|
|
50
|
+
image: authUser.image,
|
|
51
|
+
})
|
|
45
52
|
.from(authUser)
|
|
46
53
|
.where(eq(authUser.id, userId))
|
|
47
54
|
.limit(1);
|
|
48
|
-
|
|
55
|
+
// Phone-only signups have `email` null but `phoneNumber` set; the
|
|
56
|
+
// schema check constraint guarantees at least one of the two.
|
|
57
|
+
if (!user?.email && !user?.phoneNumber) {
|
|
49
58
|
return {
|
|
50
59
|
userExists: false,
|
|
51
60
|
authenticated: true,
|
|
52
|
-
reason: `No email found for user ${userId}.`,
|
|
61
|
+
reason: `No email or phone number found for user ${userId}.`,
|
|
53
62
|
};
|
|
54
63
|
}
|
|
55
64
|
const nameParts = user.name?.split(" ") ?? [];
|
package/dist/workspace.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../src/workspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voyantjs/auth",
|
|
3
|
-
"version": "0.26.
|
|
3
|
+
"version": "0.26.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"@better-auth/api-key": "^1.5.6",
|
|
54
54
|
"better-auth": "^1.5.6",
|
|
55
55
|
"drizzle-orm": "^0.45.2",
|
|
56
|
-
"@voyantjs/db": "0.26.
|
|
57
|
-
"@voyantjs/utils": "0.26.
|
|
56
|
+
"@voyantjs/db": "0.26.2",
|
|
57
|
+
"@voyantjs/utils": "0.26.2"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@types/node": "25.5.2",
|