throw exception when no tokens available

badges · Oct 28, 2021 · 8c912ba · 8c912ba
1 parent e331c2e
commit 8c912ba
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/core/base-service/index.js b/core/base-service/index.js
@@ -13,6 +13,7 @@ import {
  Inaccessible,
  InvalidParameter,
  Deprecated,
+ ImproperlyConfigured,
 } from './errors.js'
 
 export {
@@ -29,5 +30,6 @@ export {
  InvalidResponse,
  Inaccessible,
  InvalidParameter,
+ ImproperlyConfigured,
  Deprecated,
 }
diff --git a/services/librariesio/librariesio-api-provider.js b/services/librariesio/librariesio-api-provider.js
@@ -1,3 +1,4 @@
+import { ImproperlyConfigured } from '../index.js'
 import log from '../../core/server/log.js'
 import { TokenPool } from '../../core/token-pooling/token-pool.js'
 import { userAgent } from '../../core/base-service/legacy-request-handler.js'
@@ -71,9 +72,10 @@ export default class LibrariesIoApiProvider {
  try {
  token = this.standardTokens.next()
  } catch (e) {
- console.error('Unable to select next Libraries.io token from pool')
  log.error(e)
- return
+ throw new ImproperlyConfigured({
+ prettyMessage: 'Unable to select next Libraries.io token from pool',
+ })
  }
  tokenString = token.id
  } else {

diff --git a/services/librariesio/librariesio-api-provider.spec.js b/services/librariesio/librariesio-api-provider.spec.js
@@ -1,5 +1,7 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
+import { ImproperlyConfigured } from '../index.js'
+import log from '../../core/server/log.js'
 import LibrariesIoApiProvider from './librariesio-api-provider.js'
 
 describe('LibrariesIoApiProvider', function () {
@@ -20,7 +22,7 @@ describe('LibrariesIoApiProvider', function () {
  buffer: {},
  }
 
- let token, provider
+ let token, provider, nextTokenStub
  beforeEach(function () {
  provider = new LibrariesIoApiProvider({ baseUrl, tokens })
 
@@ -29,7 +31,7 @@ describe('LibrariesIoApiProvider', function () {
  invalidate: sinon.spy(),
  decrementedUsesRemaining: remaining - 1,
  }
- sinon.stub(provider.standardTokens, 'next').returns(token)
+ nextTokenStub = sinon.stub(provider.standardTokens, 'next').returns(token)
  })
 
  afterEach(function () {
@@ -43,6 +45,20 @@ describe('LibrariesIoApiProvider', function () {
  await provider.fetch(mockRequest, '/npm/badge-maker')
  expect(provider.standardTokens.next).to.have.been.calledOnce
  })
+
+ it('should throw an error when the next token fails', async function () {
+ nextTokenStub.throws(Error)
+ sinon.stub(log, 'error')
+ try {
+ await provider.fetch(mockRequest, '/npm/badge-maker')
+ expect.fail('Expected to throw')
+ } catch (e) {
+ expect(e).to.be.an.instanceof(ImproperlyConfigured)
+ expect(e.prettyMessage).to.equal(
+ 'Unable to select next Libraries.io token from pool'
+ )
+ }
+ })
  })
 
  context('a valid API response', function () {
@@ -55,10 +71,7 @@ describe('LibrariesIoApiProvider', function () {
  })
 
  it('should return the response', async function () {
- const res = await provider.fetch(
- mockRequest,
- '/npm/badge-maker'
- )
+ const res = await provider.fetch(mockRequest, '/npm/badge-maker')
  expect(Object.is(res, mockResponse)).to.be.true
  })