mirroring/cool-admin-midway
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-midway.git synced 2024-11-01 22:20:30 +08:00
Code Issues Projects Releases Wiki Activity

优化权限判断

Browse Source
This commit is contained in:
cool 2023-11-22 10:20:24 +08:00
parent ad1bfdad63
commit dca122691e
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/base/controller/admin/open.ts
View File

@ -6,6 +6,7 @@ import {
CoolUrlTag, CoolUrlTag,
CoolTag, CoolTag,
TagTypes, TagTypes,
RESCODE,
} from '@cool-midway/core'; } from '@cool-midway/core';
import { LoginDTO } from '../../dto/login'; import { LoginDTO } from '../../dto/login';
import { BaseSysLoginService } from '../../service/sys/login'; import { BaseSysLoginService } from '../../service/sys/login';
@ -84,6 +85,15 @@ export class BaseOpenController extends BaseController {
@CoolTag(TagTypes.IGNORE_TOKEN) @CoolTag(TagTypes.IGNORE_TOKEN)
@Get('/refreshToken', { summary: '刷新token' }) @Get('/refreshToken', { summary: '刷新token' })
async refreshToken(@Query('refreshToken') refreshToken: string) { async refreshToken(@Query('refreshToken') refreshToken: string) {
return this.ok(await this.baseSysLoginService.refreshToken(refreshToken)); try {
const token = await this.baseSysLoginService.refreshToken(refreshToken);
return this.ok(token);
} catch (e) {
this.ctx.status = 401;
this.ctx.body = {
code: RESCODE.COMMFAIL,
message: '登录失效~',
};
}
} }
} }

2
src/modules/base/middleware/authority.ts
View File

@ -39,7 +39,7 @@ export class BaseAuthorityMiddleware
return async (ctx: Context, next: NextFunction) => { return async (ctx: Context, next: NextFunction) => {
let statusCode = 200; let statusCode = 200;
let { url } = ctx; let { url } = ctx;
url = url.replace(this.prefix, ''); url = url.replace(this.prefix, '').split('?')[0];
const token = ctx.get('Authorization'); const token = ctx.get('Authorization');
const adminUrl = '/admin/'; const adminUrl = '/admin/';
// 路由地址为 admin前缀的 需要权限校验 // 路由地址为 admin前缀的 需要权限校验

63
src/modules/base/service/sys/login.ts
View File

@ -1,5 +1,5 @@
import { Inject, Provide, Config } from '@midwayjs/decorator'; import { Inject, Provide, Config } from '@midwayjs/decorator';
import { BaseService, CoolCommException, RESCODE } from '@cool-midway/core'; import { BaseService, CoolCommException } from '@cool-midway/core';
import { LoginDTO } from '../../dto/login'; import { LoginDTO } from '../../dto/login';
import * as svgCaptcha from 'svg-captcha'; import * as svgCaptcha from 'svg-captcha';
import { v1 as uuid } from 'uuid'; import { v1 as uuid } from 'uuid';
@ -217,43 +217,34 @@ export class BaseSysLoginService extends BaseService {
* @param token * @param token
*/ */
async refreshToken(token: string) { async refreshToken(token: string) {
try { const decoded = jwt.verify(token, this.coolConfig.jwt.secret);
const decoded = jwt.verify(token, this.coolConfig.jwt.secret); if (decoded && decoded['isRefresh']) {
if (decoded && decoded['isRefresh']) { delete decoded['exp'];
delete decoded['exp']; delete decoded['iat'];
delete decoded['iat'];
const { expire, refreshExpire } = this.coolConfig.jwt.token; const { expire, refreshExpire } = this.coolConfig.jwt.token;
decoded['isRefresh'] = false; decoded['isRefresh'] = false;
const result = { const result = {
expire, expire,
token: jwt.sign(decoded, this.coolConfig.jwt.secret, { token: jwt.sign(decoded, this.coolConfig.jwt.secret, {
expiresIn: expire, expiresIn: expire,
}), }),
refreshExpire, refreshExpire,
refreshToken: '', refreshToken: '',
};
decoded['isRefresh'] = true;
result.refreshToken = jwt.sign(decoded, this.coolConfig.jwt.secret, {
expiresIn: refreshExpire,
});
await this.cacheManager.set(
`admin:passwordVersion:${decoded['userId']}`,
decoded['passwordVersion']
);
await this.cacheManager.set(
`admin:token:${decoded['userId']}`,
result.token
);
return result;
}
} catch (err) {
this.ctx.status = 401;
this.ctx.body = {
code: RESCODE.COMMFAIL,
message: '登录失效~',
}; };
return; decoded['isRefresh'] = true;
result.refreshToken = jwt.sign(decoded, this.coolConfig.jwt.secret, {
expiresIn: refreshExpire,
});
await this.cacheManager.set(
`admin:passwordVersion:${decoded['userId']}`,
decoded['passwordVersion']
);
await this.cacheManager.set(
`admin:token:${decoded['userId']}`,
result.token
);
return result;
} }
} }
} }