removed token field and changed isRevoked field

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: [
       {

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'
+      ));
+    });
+  },
+};

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();
     })

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) => {

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));
-  });
 });

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));

tests/db/model/token/utils.js

@@ -16,7 +16,6 @@ const tu = require('../../../testUtils');
 
 const testStartTime = new Date();
 const pfx = '___';
-const jwtUtil = require('../../../../utils/jwtUtil');
 const tokenName = 'testTokenName';
 
 module.exports = {
@@ -41,16 +40,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,
       });
     });