Rewrite and test Github auth logic, separating standard and search quota

lib/fs-token-persistence.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const fsos = require('fsos')
-const githubAuth = require('./github-auth')
 const TokenPersistence = require('./token-persistence')
 
 class FsTokenPersistence extends TokenPersistence {
@@ -23,21 +22,28 @@ class FsTokenPersistence extends TokenPersistence {
     }
 
     const tokens = JSON.parse(contents)
-    tokens.forEach(tokenString => {
-      githubAuth.addGithubToken(tokenString)
-    })
+    this._tokens = new Set(tokens)
+    return tokens
   }
 
   async save() {
-    const tokens = githubAuth.getAllTokenIds()
+    const tokens = Array.from(this._tokens)
     await fsos.set(this.path, JSON.stringify(tokens))
   }
 
   async onTokenAdded(token) {
+    if (!this._tokens) {
+      throw Error('initialize() has not been called')
+    }
+    this._tokens.add(token)
     await this.save()
   }
 
   async onTokenRemoved(token) {
+    if (!this._tokens) {
+      throw Error('initialize() has not been called')
+    }
+    this._tokens.delete(token)
     await this.save()
   }
 }

lib/fs-token-persistence.spec.js

@@ -5,12 +5,8 @@ const tmp = require('tmp')
 const readFile = require('fs-readfile-promise')
 const { expect } = require('chai')
 const FsTokenPersistence = require('./fs-token-persistence')
-const githubAuth = require('./github-auth')
 
 describe('File system token persistence', function() {
-  beforeEach(githubAuth.removeAllTokens)
-  afterEach(githubAuth.removeAllTokens)
-
   let path, persistence
   beforeEach(function() {
     path = tmp.tmpNameSync()
@@ -19,8 +15,8 @@ describe('File system token persistence', function() {
 
   context('when the file does not exist', function() {
     it('does nothing', async function() {
-      await persistence.initialize()
-      expect(githubAuth.getAllTokenIds()).to.deep.equal([])
+      const tokens = await persistence.initialize()
+      expect(tokens).to.deep.equal([])
     })
 
     it('saving creates an empty file', async function() {
@@ -41,18 +37,17 @@ describe('File system token persistence', function() {
     })
 
     it('loads the contents', async function() {
-      await persistence.initialize()
-      expect(githubAuth.getAllTokenIds()).to.deep.equal(initialTokens)
+      const tokens = await persistence.initialize()
+      expect(tokens).to.deep.equal(initialTokens)
     })
 
     context('when tokens are added', function() {
       it('saves the change', async function() {
         const newToken = 'e'.repeat(40)
-        const expected = initialTokens.slice()
+        const expected = Array.from(initialTokens)
         expected.push(newToken)
 
         await persistence.initialize()
-        githubAuth.addGithubToken(newToken)
         await persistence.noteTokenAdded(newToken)
 
         const savedTokens = JSON.parse(await readFile(path))
@@ -67,7 +62,6 @@ describe('File system token persistence', function() {
 
         await persistence.initialize()
 
-        githubAuth.rmGithubToken(toRemove)
         await persistence.noteTokenRemoved(toRemove)
 
         const savedTokens = JSON.parse(await readFile(path))

lib/redis-token-persistence.integration.js

@@ -5,12 +5,8 @@ const RedisServer = require('redis-server')
 const redis = require('redis')
 const { expect } = require('chai')
 const RedisTokenPersistence = require('./redis-token-persistence')
-const githubAuth = require('./github-auth')
 
 describe('Redis token persistence', function() {
-  beforeEach(githubAuth.removeAllTokens)
-  afterEach(githubAuth.removeAllTokens)
-
   let server
   // In CI, expect redis already to be running.
   if (!process.env.CI) {
@@ -56,8 +52,8 @@ describe('Redis token persistence', function() {
 
   context('when the key does not exist', function() {
     it('does nothing', async function() {
-      await persistence.initialize()
-      expect(githubAuth.getAllTokenIds()).to.deep.equal([])
+      const tokens = await persistence.initialize()
+      expect(tokens).to.deep.equal([])
     })
   })
 
@@ -75,8 +71,8 @@ describe('Redis token persistence', function() {
     })
 
     it('loads the contents', async function() {
-      await persistence.initialize()
-      expect(githubAuth.getAllTokenIds()).to.deep.equal(initialTokens)
+      const tokens = await persistence.initialize()
+      expect(tokens).to.deep.equal(initialTokens)
     })
 
     context('when tokens are added', function() {
@@ -86,7 +82,6 @@ describe('Redis token persistence', function() {
         expected.push(newToken)
 
         await persistence.initialize()
-        githubAuth.addGithubToken(newToken)
         await persistence.noteTokenAdded(newToken)
 
         const savedTokens = await lrange(key, 0, -1)
@@ -101,7 +96,6 @@ describe('Redis token persistence', function() {
 
         await persistence.initialize()
 
-        githubAuth.rmGithubToken(toRemove)
         await persistence.noteTokenRemoved(toRemove)
 
         const savedTokens = await lrange(key, 0, -1)

lib/redis-token-persistence.js

@@ -3,7 +3,6 @@
 const redis = require('redis')
 const { promisify } = require('util')
 const log = require('./log')
-const githubAuth = require('./github-auth')
 const TokenPersistence = require('./token-persistence')
 
 class RedisTokenPersistence extends TokenPersistence {
@@ -21,16 +20,8 @@ class RedisTokenPersistence extends TokenPersistence {
 
     const lrange = promisify(this.client.lrange).bind(this.client)
 
-    let tokens
-    try {
-      tokens = await lrange(this.key, 0, -1)
-    } catch (e) {
-      log.error(e)
-    }
-
-    tokens.forEach(tokenString => {
-      githubAuth.addGithubToken(tokenString)
-    })
+    const tokens = await lrange(this.key, 0, -1)
+    return tokens
   }
 
   async stop() {