brightcove-cmsapi 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e2e95b6fa46f8dc97092182f230b0c7a176002
-  data.tar.gz: 7f6b5104c142e2ccfc4758b0a9f893edf8549706
+  metadata.gz: 4de1317ce6ac141a262964cb793af11ab2a4322e
+  data.tar.gz: 9190e766267735108922655ec629585b3c99ee13
 SHA512:
-  metadata.gz: 15222de1bbcd9ed0e009a42dd0c3fc7ef4aeb14cc06cd3fbcdda697c700525c4f10e682874d0459e0427bf30f0426c3b33d25ad926a110d770c3da683fc46366
-  data.tar.gz: 4b6fc1e5201125727f4a03d07c607e98149f8d9f9b1f632bdd506a2417744683ed82d656d08309fb898bdbacd6f4f6b4ad0eeae4c0093e5a08e995f58a724c5d
+  metadata.gz: 47562d46b41b59815aa55d4c2432bc3a3839d4556e6846ee1432b5d80aa27748b78c94ad079e524bfbae6a32f4d9af44cf995914d87bafe18e6a421f8ce96ca8
+  data.tar.gz: 2841f6d29b1c5f6e79058f82c2fb42347417b23db8ef975bd82d001aa2f2a407e25fa9049752806e4233423ccd2ea20eabf9d58a033e155f9f7c9f21046553e3

data/brightcove-cmsapi.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "brightcove-cmsapi"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Daniel King"]
   spec.email         = ["daniel.king5@nhs.net"]
 
   spec.summary       = %q{A simple wrapper around Brightcove's CMS API}
-  spec.homepage      = "https://nhs.uk"
+  spec.homepage      = "https://github.com/nhsuk/brightcove-cmsapi"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

data/lib/brightcove/cmsapi.rb

@@ -1,4 +1,5 @@
 require "http"
+require_relative "errors"
 
 module Brightcove
   class Cmsapi
@@ -13,21 +14,37 @@ module Brightcove
     end
 
     def self.default_api
+      account_id = ENV['BRIGHTCOVE_ACCOUNT_ID']
+      client_id = ENV['BRIGHTCOVE_CLIENT_ID']
+      client_secret = ENV['BRIGHTCOVE_CLIENT_SECRET']
+
+      if [account_id, client_id, client_secret].any? { |c| c.to_s.empty? }
+        raise AuthenticationError, 'Missing Brightcove API credentials'
+      end
+
       @default_api ||= new(
-        account_id: ENV['BRIGHTCOVE_ACCOUNT_ID'],
-        client_id: ENV['BRIGHTCOVE_CLIENT_ID'],
-        client_secret: ENV['BRIGHTCOVE_CLIENT_SECRET'])
+        account_id: account_id,
+        client_id: client_id,
+        client_secret: client_secret)
     end
 
     def get(path)
       set_token if @token_expires < Time.now
       response = HTTP.auth("Bearer #{@token}").get("#{@base_url}/#{path}")
 
-      if response.code == 401 # Unauthorized, token expired
+      case response.code
+      when 200 # OK
+        response
+      when 401 # Unauthorized, token expired
         set_token
-        HTTP.auth("Bearer #{@token}").get("#{@base_url}/#{path}")
-      else
+        response = HTTP.auth("Bearer #{@token}").get("#{@base_url}/#{path}")
+
+        # if a fresh token still returns 401 the request must be unauthorized
+        raise_account_error if response.code == 401
+
         response
+      else
+        raise CmsapiError, response.to_s
       end
     end
 
@@ -53,9 +70,19 @@ module Brightcove
     def set_token
       response = HTTP.basic_auth(user: @client_id, pass: @client_secret)
                      .post(OAUTH_ENDPOINT,
-                           form: { grant_type: "client_credentials" }).parse
-      @token = response.fetch("access_token")
-      @token_expires = Time.now + response.fetch("expires_in")
+                           form: { grant_type: "client_credentials" })
+      token_response = response.parse
+
+      if response.status == 200
+        @token = token_response.fetch("access_token")
+        @token_expires = Time.now + token_response.fetch("expires_in")
+      else
+        raise AuthenticationError, token_response.fetch("error_description")
+      end
+    end
+
+    def raise_account_error
+      raise AuthenticationError, 'Token valid but not for the given account_id'
     end
   end
 end

data/lib/brightcove/errors.rb

@@ -0,0 +1,8 @@
+module Brightcove
+  class CmsapiError < StandardError
+  end
+
+  # AuthenticationError is raised when the Oauth authentication fails
+  class AuthenticationError < CmsapiError
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcove-cmsapi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel King
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,8 @@ files:
 - bin/setup
 - brightcove-cmsapi.gemspec
 - lib/brightcove/cmsapi.rb
-homepage: https://nhs.uk
+- lib/brightcove/errors.rb
+homepage: https://github.com/nhsuk/brightcove-cmsapi
 licenses:
 - MIT
 metadata: {}
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A simple wrapper around Brightcove's CMS API