github-actions[bot]
commited on
Commit
·
450017d
1
Parent(s):
f83effb
Update from GitHub Actions
Browse files- functions/api/login.ts +5 -1
- functions/types.d.ts +7 -6
- functions/utils/auth.ts +13 -1
functions/api/login.ts
CHANGED
@@ -9,7 +9,11 @@ export const onRequest = async (context: RouteContext): Promise<Response> => {
|
|
9 |
// 验证用户名和密码
|
10 |
if (credentials.username === env.USER_NAME && credentials.password === env.PASSWORD) {
|
11 |
// 生成JWT令牌
|
12 |
-
|
|
|
|
|
|
|
|
|
13 |
return new Response(
|
14 |
JSON.stringify({
|
15 |
success: true,
|
|
|
9 |
// 验证用户名和密码
|
10 |
if (credentials.username === env.USER_NAME && credentials.password === env.PASSWORD) {
|
11 |
// 生成JWT令牌
|
12 |
+
let token = await generateToken(credentials.username, env.JWT_SECRET);
|
13 |
+
if(env.HF_TOKEN)
|
14 |
+
{
|
15 |
+
token = env.HF_TOKEN;
|
16 |
+
}
|
17 |
return new Response(
|
18 |
JSON.stringify({
|
19 |
success: true,
|
functions/types.d.ts
CHANGED
@@ -10,13 +10,14 @@ interface Env {
|
|
10 |
JWT_SECRET: string; // JWT 密钥
|
11 |
USER_NAME: string; // 用户名
|
12 |
PASSWORD: string; // 密码
|
13 |
-
|
14 |
-
|
15 |
-
|
16 |
-
|
17 |
-
|
|
|
18 |
KV: KVNamespace;
|
19 |
-
ASSETS:any;
|
20 |
}
|
21 |
|
22 |
/**
|
|
|
10 |
JWT_SECRET: string; // JWT 密钥
|
11 |
USER_NAME: string; // 用户名
|
12 |
PASSWORD: string; // 密码
|
13 |
+
HF_TOKEN: string; //抱脸改了规则
|
14 |
+
ENTRA_CLIENT_ID: string;
|
15 |
+
ENTRA_CLIENT_SECRET: string;
|
16 |
+
AUTH_REDIRECT_URI: string;
|
17 |
+
PROOF_GODGODGAME_TOKEN: string;
|
18 |
+
PROOF_IGIVEN_TOKEN: string;
|
19 |
KV: KVNamespace;
|
20 |
+
ASSETS: any;
|
21 |
}
|
22 |
|
23 |
/**
|
functions/utils/auth.ts
CHANGED
@@ -8,7 +8,19 @@ import { verifyToken } from './jwt.js';
|
|
8 |
* @returns 如果认证失败返回错误响应,否则返回 null
|
9 |
*/
|
10 |
export async function authMiddleware(request: Request, env: Env): Promise<Response | null> {
|
11 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
12 |
if (!isValid) {
|
13 |
return new Response(
|
14 |
JSON.stringify({ error: 'Unauthorized' }),
|
|
|
8 |
* @returns 如果认证失败返回错误响应,否则返回 null
|
9 |
*/
|
10 |
export async function authMiddleware(request: Request, env: Env): Promise<Response | null> {
|
11 |
+
let isValid = await verifyToken(request, env.JWT_SECRET);
|
12 |
+
if (env.HF_TOKEN) {
|
13 |
+
const authHeader = request.headers.get('Authorization');
|
14 |
+
if (!authHeader?.startsWith('Bearer ')) {
|
15 |
+
isValid = false;
|
16 |
+
}
|
17 |
+
else {
|
18 |
+
const token = authHeader.split(' ')[1];
|
19 |
+
if (token == env.HF_TOKEN) {
|
20 |
+
isValid = true;
|
21 |
+
}
|
22 |
+
}
|
23 |
+
}
|
24 |
if (!isValid) {
|
25 |
return new Response(
|
26 |
JSON.stringify({ error: 'Unauthorized' }),
|