@layer-ai/core 0.1.4 → 0.1.6
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/middleware/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAK1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB;KACF;CACF;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/middleware/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAK1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,UAAU,CAAC,EAAE,MAAM,CAAC;SACrB;KACF;CACF;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAkFf;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GACjB,IAAI,CAWN"}
|
package/dist/middleware/auth.js
CHANGED
|
@@ -25,45 +25,49 @@ export async function authenticate(req, res, next) {
|
|
|
25
25
|
});
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
|
-
const
|
|
29
|
-
if (!
|
|
28
|
+
const token = authHeader.substring(7); // Remove "Bearer "
|
|
29
|
+
if (!token) {
|
|
30
30
|
res.status(401).json({
|
|
31
31
|
error: 'unauthorized',
|
|
32
|
-
message: '
|
|
32
|
+
message: 'Missing token',
|
|
33
33
|
});
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
-
const
|
|
36
|
+
const tokenHash = crypto
|
|
37
37
|
.createHash('sha256')
|
|
38
|
-
.update(
|
|
38
|
+
.update(token)
|
|
39
39
|
.digest('hex');
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
if (!
|
|
45
|
-
res.status(401).json({
|
|
40
|
+
// All tokens start with 'layer_', so we need to check both API keys and session keys
|
|
41
|
+
// First try API keys
|
|
42
|
+
const apiKeyRecord = await db.getApiKeyByHash(tokenHash);
|
|
43
|
+
if (apiKeyRecord) {
|
|
44
|
+
if (!apiKeyRecord.isActive) {
|
|
45
|
+
res.status(401).json({
|
|
46
|
+
error: 'unauthorized',
|
|
47
|
+
message: 'API key has been revoked',
|
|
48
|
+
});
|
|
46
49
|
return;
|
|
47
50
|
}
|
|
48
|
-
|
|
51
|
+
// Attach userId to request for downstream handlers
|
|
52
|
+
req.userId = apiKeyRecord.userId;
|
|
53
|
+
req.apiKeyHash = tokenHash;
|
|
54
|
+
// Update last_used_at timestamp (async, dont await)
|
|
55
|
+
db.updateApiKeyLastUsed(tokenHash).catch((err) => {
|
|
56
|
+
console.error('Failed to update API key last_used_at:', err);
|
|
57
|
+
});
|
|
49
58
|
next();
|
|
50
59
|
return;
|
|
51
60
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
61
|
+
// Not an API key, try session key
|
|
62
|
+
const sessionKey = await db.getSessionKeyByHash(tokenHash);
|
|
63
|
+
if (sessionKey) {
|
|
64
|
+
req.userId = sessionKey.userId;
|
|
65
|
+
next();
|
|
57
66
|
return;
|
|
58
67
|
}
|
|
59
|
-
//
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
// Update last_used_at timestamp (async, dont await)
|
|
63
|
-
db.updateApiKeyLastUsed(keyHash).catch((err) => {
|
|
64
|
-
console.error('Failed to update API key last_used_at:', err);
|
|
65
|
-
});
|
|
66
|
-
next();
|
|
68
|
+
// Neither API key nor session key
|
|
69
|
+
res.status(401).json({ error: 'unauthorized', message: 'Invalid token' });
|
|
70
|
+
return;
|
|
67
71
|
}
|
|
68
72
|
catch (error) {
|
|
69
73
|
console.error('Authentication error:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/routes/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AAKpD,QAAA,MAAM,MAAM,EAAE,UAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/routes/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AAKpD,QAAA,MAAM,MAAM,EAAE,UAAqB,CAAC;AA4FpC,eAAe,MAAM,CAAC"}
|
package/dist/routes/auth.js
CHANGED
|
@@ -79,11 +79,4 @@ router.post('/token', async (req, res) => {
|
|
|
79
79
|
res.status(500).json({ error: 'internal_error', message: 'Failed to create api key' });
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
|
-
// GET /auth/session
|
|
83
|
-
// This endpoint is used by NextAuth to check session status
|
|
84
|
-
router.get('/session', async (req, res) => {
|
|
85
|
-
// For now, return null session (not authenticated via this endpoint)
|
|
86
|
-
// NextAuth will handle sessions via its own mechanism
|
|
87
|
-
res.json({ user: null });
|
|
88
|
-
});
|
|
89
82
|
export default router;
|