7167-testToMaster_2414 #2244
|
@ -27,8 +27,10 @@ describe('Renew Token', () => {
|
||||||
jasmine.clock().uninstall();
|
jasmine.clock().uninstall();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should renew process', async() => {
|
it('should renew token', async() => {
|
||||||
jasmine.clock().mockDate(new Date(startingTime + 21600000));
|
const mockDate = new Date(startingTime + 26600000);
|
||||||
|
jasmine.clock().mockDate(mockDate);
|
||||||
|
console.log(startingTime, mockDate)
|
||||||
const {id} = await models.VnUser.renewToken(ctx);
|
const {id} = await models.VnUser.renewToken(ctx);
|
||||||
|
|
||||||
expect(id).not.toEqual(ctx.req.accessToken.id);
|
expect(id).not.toEqual(ctx.req.accessToken.id);
|
||||||
|
|
|
@ -20,10 +20,7 @@ describe('VnUser Sign-in()', () => {
|
||||||
let ctx = {req: {accessToken: accessToken}};
|
let ctx = {req: {accessToken: accessToken}};
|
||||||
let signInLog = await SignInLog.find({where: {token: accessToken.id}});
|
let signInLog = await SignInLog.find({where: {token: accessToken.id}});
|
||||||
|
|
||||||
expect(signInLog.length).toEqual(1);
|
expect(signInLog.length).toEqual(0);
|
||||||
expect(signInLog[0].userFk).toEqual(accessToken.userId);
|
|
||||||
expect(signInLog[0].owner).toEqual(true);
|
|
||||||
expect(login.token).toBeDefined();
|
|
||||||
|
|
||||||
await VnUser.logout(ctx.req.accessToken.id);
|
await VnUser.logout(ctx.req.accessToken.id);
|
||||||
});
|
});
|
||||||
|
|
|
@ -134,15 +134,16 @@ module.exports = function(Self) {
|
||||||
Self.signInValidate = async(user, userToken, token, ctx) => {
|
Self.signInValidate = async(user, userToken, token, ctx) => {
|
||||||
const [[key, value]] = Object.entries(Self.userUses(user));
|
const [[key, value]] = Object.entries(Self.userUses(user));
|
||||||
const isOwner = Self.rawSql(`SELECT ? = ? `, [userToken[key], value]);
|
const isOwner = Self.rawSql(`SELECT ? = ? `, [userToken[key], value]);
|
||||||
await Self.app.models.SignInLog.create({
|
if (!isOwner) {
|
||||||
userName: user,
|
await Self.app.models.SignInLog.create({
|
||||||
token: token.id,
|
userName: user,
|
||||||
userFk: userToken.id,
|
token: token.id,
|
||||||
ip: ctx.req.ip,
|
userFk: userToken.id,
|
||||||
owner: isOwner
|
ip: ctx.req.ip,
|
||||||
});
|
owner: isOwner
|
||||||
if (!isOwner)
|
});
|
||||||
throw new UserError('Try again');
|
throw new UserError('Try again');
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
DELETE FROM `account`.`signInLog` where owner <> FALSE
|
Loading…
Reference in New Issue