jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make reset tokens only valid for a day

Browse Source 
fixes #563

mysql timestamps cannot be null. it will become current timestamp when
set as null
This commit is contained in:
Girish Ramakrishnan
2020-03-30 16:47:18 -07:00
parent 5d6a02f73c
commit 936f456cec
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/database-test.js
View File

@@ -40,7 +40,8 @@ var USER_0 = {
twoFactorAuthenticationSecret: '',
role: 'user',
active: true,
source: ''
source: '',
resetTokenCreationTime: Date.now()
};
var USER_1 = {
@@ -58,7 +59,8 @@ var USER_1 = {
twoFactorAuthenticationSecret: '',
role: 'user',
active: true,
source: ''
source: '',
resetTokenCreationTime: Date.now()
};
var USER_2 = {
@@ -76,7 +78,8 @@ var USER_2 = {
twoFactorAuthenticationSecret: '',
role: 'user',
active: true,
source: ''
source: '',
resetTokenCreationTime: Date.now()
};
const DOMAIN_0 = {
@@ -980,7 +983,7 @@ describe('database', function () {
appdb.get(APP_0.id, function (error, result) {
expect(error).to.be(null);
expect(result).to.be.an('object');
expect(_.omit(result, ['creationTime', 'updateTime', 'ts', 'healthTime'])).to.be.eql(APP_0);
expect(_.omit(result, ['creationTime', 'updateTime', 'ts', 'healthTime', 'resetTokenCreationTime'])).to.be.eql(APP_0);
done();
});
});
@@ -1020,7 +1023,7 @@ describe('database', function () {
appdb.get(APP_0.id, function (error, result) {
expect(error).to.be(null);
expect(result).to.be.an('object');
expect(_.omit(result, ['creationTime', 'updateTime', 'ts', 'healthTime'])).to.be.eql(APP_0);
expect(_.omit(result, ['creationTime', 'updateTime', 'ts', 'healthTime','resetTokenCreationTime'])).to.be.eql(APP_0);
done();
});
});
@@ -1030,7 +1033,7 @@ describe('database', function () {
appdb.getByHttpPort(APP_0.httpPort, function (error, result) {
expect(error).to.be(null);
expect(result).to.be.an('object');
expect(_.omit(result, ['creationTime', 'updateTime', 'ts', 'healthTime'])).to.be.eql(APP_0);
expect(_.omit(result, ['creationTime', 'updateTime', 'ts', 'healthTime','resetTokenCreationTime'])).to.be.eql(APP_0);
done();
});
});
@@ -1055,8 +1058,8 @@ describe('database', function () {
expect(error).to.be(null);
expect(result).to.be.an(Array);
expect(result.length).to.be(2);
expect(_.omit(result[0], ['creationTime', 'updateTime','ts', 'healthTime'])).to.be.eql(APP_0);
expect(_.omit(result[1], ['creationTime', 'updateTime','ts', 'healthTime'])).to.be.eql(APP_1);
expect(_.omit(result[0], ['creationTime', 'updateTime','ts', 'healthTime', 'resetTokenCreationTime'])).to.be.eql(APP_0);
expect(_.omit(result[1], ['creationTime', 'updateTime','ts', 'healthTime', 'resetTokenCreationTime'])).to.be.eql(APP_1);
done();
});
});