diff --git a/package.json b/package.json index 395f3b0..110d9cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kevisual/api", - "version": "0.0.56", + "version": "0.0.57", "description": "", "main": "mod.ts", "scripts": { diff --git a/query/query-login/login-cache.ts b/query/query-login/login-cache.ts index 8dfa36d..d8e6930 100644 --- a/query/query-login/login-cache.ts +++ b/query/query-login/login-cache.ts @@ -16,7 +16,7 @@ export interface Cache { */ init?: () => Promise; } -type User = { +export type User = { avatar?: string; description?: string; id?: string; diff --git a/query/query-login/query-login.ts b/query/query-login/query-login.ts index 5e2c35f..82e15d0 100644 --- a/query/query-login/query-login.ts +++ b/query/query-login/query-login.ts @@ -1,6 +1,6 @@ import { Query, BaseQuery } from '@kevisual/query'; import type { Result, DataOpts } from '@kevisual/query/query'; -import { LoginCacheStore, CacheStore } from './login-cache.ts'; +import { LoginCacheStore, CacheStore, User } from './login-cache.ts'; import { Cache } from './login-cache.ts'; import { BaseLoad } from '@kevisual/load'; export type QueryLoginOpts = { @@ -128,7 +128,8 @@ export class QueryLogin extends BaseQuery { * 登陆成功,需要获取用户信息进行缓存 * @param param0 */ - async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }) { + async beforeSetLoginUser(opts: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }): Promise> { + const { accessToken, refreshToken, check401, accessTokenExpiresIn } = opts; if (accessToken && refreshToken) { const resUser = await this.getMe(accessToken, check401); if (resUser.code === 200) { @@ -146,7 +147,12 @@ export class QueryLogin extends BaseQuery { console.error('登录失败'); } } + return resUser; } + return { + code: 400, + message: '登录失败', + }; } /** * 刷新token