feat: 更新依赖版本,优化用户模型构造函数和域名管理路由
This commit is contained in:
@@ -67,8 +67,10 @@ export class User {
|
||||
avatar: string;
|
||||
tokenUser: any;
|
||||
|
||||
constructor(data: UserSelect) {
|
||||
Object.assign(this, data);
|
||||
constructor(data?: UserSelect) {
|
||||
if (data) {
|
||||
Object.assign(this, data);
|
||||
}
|
||||
}
|
||||
|
||||
setTokenUser(tokenUser: any) {
|
||||
@@ -91,7 +93,7 @@ export class User {
|
||||
exp: Math.floor(Date.now() / 1000) + expiresIn,
|
||||
});
|
||||
await oauth.setJwksToken(accessToken, { id: user.id, expire: expiresIn });
|
||||
|
||||
|
||||
const token = {
|
||||
accessToken,
|
||||
refreshToken: accessToken,
|
||||
@@ -99,7 +101,7 @@ export class User {
|
||||
refreshTokenExpiresIn: expiresIn,
|
||||
accessTokenExpiresIn: expiresIn,
|
||||
};
|
||||
|
||||
|
||||
return {
|
||||
type: 'jwks',
|
||||
...token,
|
||||
@@ -150,9 +152,9 @@ export class User {
|
||||
throw new CustomError('Invalid refresh token');
|
||||
}
|
||||
const decoded = await jwksManager.decode(jwsRefreshToken);
|
||||
return await User.createJwksTokenResponse({
|
||||
id: decoded.sub.replace('user:', ''),
|
||||
username: decoded.name
|
||||
return await User.createJwksTokenResponse({
|
||||
id: decoded.sub.replace('user:', ''),
|
||||
username: decoded.name
|
||||
});
|
||||
}
|
||||
if (!refreshToken && !accessToken) {
|
||||
@@ -212,9 +214,9 @@ export class User {
|
||||
throw new CustomError('Invalid refresh token');
|
||||
}
|
||||
const decoded = await jwksManager.decode(refreshToken);
|
||||
return await User.createJwksTokenResponse({
|
||||
id: decoded.sub.replace('user:', ''),
|
||||
username: decoded.name
|
||||
return await User.createJwksTokenResponse({
|
||||
id: decoded.sub.replace('user:', ''),
|
||||
username: decoded.name
|
||||
});
|
||||
}
|
||||
return await oauth.resetToken(refreshToken, expand);
|
||||
|
||||
Reference in New Issue
Block a user