#6264 - renewToken #1824
|
@ -29,7 +29,8 @@ module.exports = Self => {
|
||||||
|
|
||||||
// Check if current token is valid
|
// Check if current token is valid
|
||||||
const isValid = await validateToken(token);
|
const isValid = await validateToken(token);
|
||||||
if (isValid) throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded');
|
if (isValid)
|
||||||
|
return token;
|
||||||
|
|
||||||
const {courtesyTime} = await models.AccessTokenConfig.findOne({fields: ['courtesyTime']});
|
const {courtesyTime} = await models.AccessTokenConfig.findOne({fields: ['courtesyTime']});
|
||||||
|
|
||||||
|
|
|
@ -37,13 +37,13 @@ describe('Renew Token', () => {
|
||||||
it('NOT should renew', async() => {
|
it('NOT should renew', async() => {
|
||||||
let error;
|
let error;
|
||||||
try {
|
try {
|
||||||
await models.VnUser.renewToken(ctx);
|
const response = await models.VnUser.renewToken(ctx);
|
||||||
|
|
||||||
|
expect(error).toBeUnDefined();
|
||||||
|
expect(error.statusCode).toBe(200);
|
||||||
|
expect(response.token.id).toEqual(ctx.req.accessToken.id);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error = e;
|
error = e;
|
||||||
}
|
}
|
||||||
|
|
||||||
expect(error).toBeDefined();
|
|
||||||
expect(error.statusCode).toBe(400);
|
|
||||||
expect(error.message).toEqual('The renew period has not been exceeded');
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -103,10 +103,6 @@ export default class Token {
|
||||||
const token = res.data;
|
const token = res.data;
|
||||||
this.set(token.id, now, token.ttl, this.remember);
|
this.set(token.id, now, token.ttl, this.remember);
|
||||||
})
|
})
|
||||||
.catch(res => {
|
|
||||||
if (res.data?.error?.code !== 'periodNotExceeded')
|
|
||||||
throw res;
|
|
||||||
})
|
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
this.checking = false;
|
this.checking = false;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue