Add tests for TokenService

Author: dmitrizagidulin

lib/token-service.js

@@ -1,26 +1,32 @@
 'use strict'
 
 const moment = require('moment')
-const uid = require('uid-safe').sync
-const extend = require('extend')
+const ulid = require('ulid')
 
 class TokenService {
   constructor () {
     this.tokens = {}
   }
-  generate (opts = {}) {
-    const token = uid(20)
-    this.tokens[token] = {
+
+  generate (data = {}) {
+    const token = ulid()
+
+    const value = {
       exp: moment().add(20, 'minutes')
     }
-    this.tokens[token] = extend(this.tokens[token], opts)
+
+    this.tokens[token] = Object.assign({}, value, data)
 
     return token
   }
+
   verify (token) {
     const now = new Date()
-    if (this.tokens[token] && now < this.tokens[token].exp) {
-      return this.tokens[token]
+
+    let tokenValue = this.tokens[token]
+
+    if (tokenValue && now < tokenValue.exp) {
+      return tokenValue
     } else {
       return false
     }

package.json

@@ -52,13 +52,13 @@
     "jsonld": "^0.4.5",
     "li": "^1.0.1",
     "mime-types": "^2.1.11",
-    "moment": "^2.13.0",
+    "moment": "^2.18.1",
     "negotiator": "^0.6.0",
     "node-fetch": "^1.6.3",
     "node-forge": "^0.6.38",
     "nodemailer": "^3.1.4",
     "nomnom": "^1.8.1",
-    "oidc-auth-manager": "^0.5.0",
+    "oidc-auth-manager": "^0.5.4",
     "oidc-op-express": "^0.0.3",
     "rdflib": "^0.15.0",
     "recursive-readdir": "^2.1.0",
@@ -69,7 +69,7 @@
     "solid-permissions": "^0.5.1",
     "solid-ws": "^0.2.3",
     "string": "^3.3.0",
-    "uid-safe": "^2.1.1",
+    "ulid": "^0.1.0",
     "uuid": "^3.0.0",
     "valid-url": "^1.0.9",
     "vhost": "^3.0.2",

test/integration/authentication-oidc.js

@@ -208,8 +208,6 @@ describe('Authentication API (OIDC)', () => {
           done(err)
         })
     })
-
-    it('At /login, enter WebID & password -> redirect back to /foo')
   })
 
   describe('Post-logout page (GET /goodbye)', () => {

test/unit/token-service.js

@@ -0,0 +1,72 @@
+'use strict'
+
+const moment = require('moment')
+const chai = require('chai')
+const expect = chai.expect
+const dirtyChai = require('dirty-chai')
+chai.use(dirtyChai)
+chai.should()
+
+const TokenService = require('../../lib/token-service')
+
+describe('TokenService', () => {
+  describe('constructor()', () => {
+    it('should init with an empty tokens store', () => {
+      let service = new TokenService()
+
+      expect(service.tokens).to.exist()
+    })
+  })
+
+  describe('generate()', () => {
+    it('should generate a new token and return a token key', () => {
+      let service = new TokenService()
+
+      let token = service.generate()
+      let value = service.tokens[token]
+
+      expect(token).to.exist()
+      expect(value).to.have.property('exp')
+    })
+  })
+
+  describe('verify()', () => {
+    it('should return false for expired tokens', () => {
+      let service = new TokenService()
+
+      let token = service.generate()
+
+      service.tokens[token].exp = moment().subtract(40, 'minutes')
+
+      expect(service.verify(token)).to.be.false()
+    })
+
+    it('should return false for non-existent tokens', () => {
+      let service = new TokenService()
+
+      let token = 'invalid token 123'
+
+      expect(service.verify(token)).to.be.false()
+    })
+
+    it('should return the token value if token not expired', () => {
+      let service = new TokenService()
+
+      let token = service.generate()
+
+      expect(service.verify(token)).to.be.ok()
+    })
+  })
+
+  describe('remove()', () => {
+    it('should remove a generated token from the service', () => {
+      let service = new TokenService()
+
+      let token = service.generate()
+
+      service.remove(token)
+
+      expect(service.tokens[token]).to.not.exist()
+    })
+  })
+})