From ba02dfa2c689af537b96c8263c519049d8bf41a8 Mon Sep 17 00:00:00 2001 From: Pallavi Singh Date: Mon, 28 Nov 2016 12:59:57 -0600 Subject: [PATCH] removed token field and changed isRevoked field --- db/model/token.js | 17 +------- ...3443-token-del-tokenfield-upd-isRevoked.js | 42 +++++++++++++++++++ tests/api/v1/authenticate/utils.js | 2 +- tests/api/v1/globalconfig/utils.js | 2 +- tests/api/v1/ssoconfig/utils.js | 2 +- tests/db/model/ssoconfig/utils.js | 2 +- tests/db/model/token/create.js | 16 +------ tests/db/model/token/delete.js | 1 - tests/db/model/token/find.js | 11 +---- tests/db/model/token/update.js | 6 +-- tests/db/model/token/utils.js | 9 +--- 11 files changed, 53 insertions(+), 57 deletions(-) create mode 100644 migrations/20161128043443-token-del-tokenfield-upd-isRevoked.js diff --git a/db/model/token.js b/db/model/token.js index 99489f9996..a0b23155e1 100644 --- a/db/model/token.js +++ b/db/model/token.js @@ -27,17 +27,12 @@ module.exports = function token(seq, dataTypes) { type: dataTypes.STRING(constants.fieldlen.normalName), allowNull: false, }, - token: { - type: dataTypes.STRING, - allowNull: false, - unique: true, - }, isDeleted: { type: dataTypes.BIGINT, defaultValue: 0, allowNull: false, }, - isDisabled: { + isRevoked: { type: dataTypes.BIGINT, defaultValue: 0, allowNull: false, @@ -59,7 +54,6 @@ module.exports = function token(seq, dataTypes) { association: assoc.createdBy, }, ], - attributes: { exclude: ['token'] }, order: ['Token.name'], }, { @@ -72,15 +66,6 @@ module.exports = function token(seq, dataTypes) { beforeDestroy(inst /* , opts */) { return common.setIsDeleted(seq.Promise, inst); }, - - beforeCreate(inst /* , opts */) { - return new seq.Promise((resolve, reject) => - u.hashPassword(seq, inst.get('token')) - .then((hash) => inst.set('token', hash)) - .then(() => resolve(inst)) - .catch((err) => reject(err)) - ); - }, }, indexes: [ { diff --git a/migrations/20161128043443-token-del-tokenfield-upd-isRevoked.js b/migrations/20161128043443-token-del-tokenfield-upd-isRevoked.js new file mode 100644 index 0000000000..351ac812e2 --- /dev/null +++ b/migrations/20161128043443-token-del-tokenfield-upd-isRevoked.js @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2016, salesforce.com, inc. + * All rights reserved. + * Licensed under the BSD 3-Clause license. + * For full license text, see LICENSE.txt file in the repo root or + * https://opensource.org/licenses/BSD-3-Clause + */ + +module.exports = { + + up: function (queryInterface, Sequelize) { + return queryInterface.sequelize.transaction((t) => { + return queryInterface.removeColumn( + 'Tokens', + 'token' + ).then(() => queryInterface.renameColumn( + 'Tokens', + 'isDisabled', + 'isRevoked' + )); + }); + }, + + down: function (queryInterface, Sequelize) { + return queryInterface.sequelize.transaction((t) => { + return queryInterface.addColumn( + 'Tokens', + 'token', + { + type: Sequelize.STRING, + allowNull: false, + unique: true, + } + ) + .then(() => queryInterface.renameColumn( + 'Tokens', + 'isRevoked', + 'isDisabled' + )); + }); + }, +}; diff --git a/tests/api/v1/authenticate/utils.js b/tests/api/v1/authenticate/utils.js index ea2b432f31..bdca66753e 100644 --- a/tests/api/v1/authenticate/utils.js +++ b/tests/api/v1/authenticate/utils.js @@ -34,7 +34,7 @@ module.exports = { return tu.db.SSOConfig.create(samlParams); }, forceDeleteSSOConfig(done) { - return tu.db.SSOConfig.destroy({ + tu.db.SSOConfig.destroy({ where: {}, force: true, }) diff --git a/tests/api/v1/globalconfig/utils.js b/tests/api/v1/globalconfig/utils.js index 468d2b82a3..92c69d4204 100644 --- a/tests/api/v1/globalconfig/utils.js +++ b/tests/api/v1/globalconfig/utils.js @@ -17,7 +17,7 @@ const testStartTime = new Date(); module.exports = { forceDelete(done) { - return tu.db.GlobalConfig.destroy({ + tu.db.GlobalConfig.destroy({ where: { key: { $iLike: tu.namePrefix + '%', diff --git a/tests/api/v1/ssoconfig/utils.js b/tests/api/v1/ssoconfig/utils.js index fe65affeae..10d48805a0 100644 --- a/tests/api/v1/ssoconfig/utils.js +++ b/tests/api/v1/ssoconfig/utils.js @@ -18,7 +18,7 @@ const samlParams = { module.exports = { forceDelete(done) { - return tu.db.SSOConfig.destroy({ + tu.db.SSOConfig.destroy({ where: {}, force: true, }) diff --git a/tests/db/model/ssoconfig/utils.js b/tests/db/model/ssoconfig/utils.js index a1b3a8f52b..98c02cec6b 100644 --- a/tests/db/model/ssoconfig/utils.js +++ b/tests/db/model/ssoconfig/utils.js @@ -19,7 +19,7 @@ const samlParams = { module.exports = { forceDelete(done) { - return tu.db.SSOConfig.destroy({ + tu.db.SSOConfig.destroy({ where: {}, force: true, }) diff --git a/tests/db/model/token/create.js b/tests/db/model/token/create.js index 0348bf470e..e259b27421 100644 --- a/tests/db/model/token/create.js +++ b/tests/db/model/token/create.js @@ -48,27 +48,13 @@ describe('db: Token: create', () => { afterEach(u.forceDelete); it('Create token object', (done) => { - // create token - const token = jwtUtil.createToken({ - name: userObj.name, - email: userObj.name, - }); - Token.create({ name: tokenName, - token, createdBy: userObj.id, }) .then((createdToken) => { expect(createdToken.name).to.be.equal(tokenName); - bcrypt.compare(token, createdToken.token, (err, res) => { - if (err) { - throw err; - } - - expect(res).to.be.true; // eslint-disable-line no-unused-expressions - }); - expect(createdToken.isDisabled).to.be.equal('0'); + expect(createdToken.isRevoked).to.be.equal('0'); expect(createdToken.createdBy).to.be.equal(userObj.id); done(); }) diff --git a/tests/db/model/token/delete.js b/tests/db/model/token/delete.js index 54e8974f32..78ce8bb652 100644 --- a/tests/db/model/token/delete.js +++ b/tests/db/model/token/delete.js @@ -30,7 +30,6 @@ describe('db: Token: find', () => { afterEach(u.forceDelete); it('Delete token object', (done) => { - console.log(u.tokenObj); Token.findById(tokenObj.id) .then((returnedToken) => returnedToken.destroy()) .then((delToken) => { diff --git a/tests/db/model/token/find.js b/tests/db/model/token/find.js index 4d6e1c7c0b..86ffc0d92c 100644 --- a/tests/db/model/token/find.js +++ b/tests/db/model/token/find.js @@ -37,7 +37,7 @@ describe('db: Token: find', () => { expect(returnedToken.name).to.be.equal(tokenObj.name); expect(returnedToken.id).to.be.equal(tokenObj.id); expect(returnedToken.createdBy).to.be.equal(tokenObj.createdBy); - expect(returnedToken.isDisabled).to.be.equal(tokenObj.isDisabled); + expect(returnedToken.isRevoked).to.be.equal(tokenObj.isRevoked); done(); }) .catch((err) => done(err)); @@ -51,13 +51,4 @@ describe('db: Token: find', () => { }) .catch((err) => done(err)); }); - - it('token is not returned', (done) => { - Token.findById(tokenObj.id) - .then((returnedToken) => { - expect(returnedToken.token).to.be.eql(undefined); - done(); - }) - .catch((err) => done(err)); - }); }); diff --git a/tests/db/model/token/update.js b/tests/db/model/token/update.js index 676889b91b..601cf0e29e 100644 --- a/tests/db/model/token/update.js +++ b/tests/db/model/token/update.js @@ -41,12 +41,12 @@ describe('db: Token: update', () => { .catch((err) => done(err)); }); - it('Disable a token', (done) => { + it('Revoke a token', (done) => { const date = Date.now(); Token.findById(tokenObj.id) - .then((returnedToken) => returnedToken.update({ isDisabled: date })) + .then((returnedToken) => returnedToken.update({ isRevoked: date })) .then((updatedToken) => { - expect(updatedToken.isDisabled).to.be.eql(date); + expect(updatedToken.isRevoked).to.be.eql(date); done(); }) .catch((err) => done(err)); diff --git a/tests/db/model/token/utils.js b/tests/db/model/token/utils.js index e80df00cbe..4218eb8d8c 100644 --- a/tests/db/model/token/utils.js +++ b/tests/db/model/token/utils.js @@ -16,7 +16,7 @@ const tu = require('../../../testUtils'); const testStartTime = new Date(); const pfx = '___'; -const jwtUtil = require('../../../../api/v1/helpers/jwtUtil'); +// const jwtUtil = require('../../../../api/v1/helpers/jwtUtil'); const tokenName = 'testTokenName'; module.exports = { @@ -41,16 +41,9 @@ module.exports = { }) ) .then((returnedUser) => { - // create token - const token = jwtUtil.createToken({ - name: returnedUser.name, - email: returnedUser.email, - }); - // create Token object return tu.db.Token.create({ name: tokenName, - token, createdBy: returnedUser.id, }); });