nomis-api-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b189250ccb75265b2ea337a3b285f9aa0ac15d1
-  data.tar.gz: 46e3e49ac09d5fcc76198f16a8ddda01cab1ae61
+  metadata.gz: 61abe8cac6c008008682e6496d4ec8b6678d3d54
+  data.tar.gz: 7b3f94e1036fc8be3cddb483529109de5e145e90
 SHA512:
-  metadata.gz: 3cae9a8f6236c82c52ae8cff6a32036b0ce4f7ba9ddfed8560b3d4463c365983682369cc4223a88b4b707b2030b8acdd720171887eb8da4fcddafc0400ff7376
-  data.tar.gz: b1db9098bc9958fe862e7216ec6a12d49558d020402264bd8c8fd137105934151ffbe476561324c9873304e0936a1b9154bc018a618b98927cfbb85040690abc
+  metadata.gz: f2a5063b7ad15686499cd2483c4eafb86c518f27b13613b48d535d599023c6343687277fb756736af94dbaba76e82d2b621d29adf73ad595a610ff94552926b8
+  data.tar.gz: a04e789fb87a8f53e9ee8919d0a0d3281bf51698ff9e5c97145430e78492f76df6396a1bd6b83b1c4f4a76e89f170f0dc6de0222b04a1301b6df95ae3a698d78

data/lib/nomis/api.rb

@@ -2,3 +2,4 @@ require 'nomis/api/auth_token'
 require 'nomis/api/get'
 require 'nomis/api/parsed_response'
 require 'nomis/api/post'
+require 'nomis/api/token_mismatch_error'

data/lib/nomis/api/auth_token.rb

@@ -6,7 +6,7 @@ module NOMIS
   module API
     # Encapsulates the complexity of generating a JWT bearer token
     class AuthToken
-      attr_accessor :client_token, :client_key, :iat_fudge_factor
+      attr_accessor :client_token, :client_key, :iat_fudge_factor, :now
 
       # iat_fudge_factor allows you to correct for time drift between your
       # client and the target server.
@@ -29,14 +29,12 @@ module NOMIS
       def bearer_token
         validate_keys!
 
-        auth_token = JWT.encode(payload, client_key, 'ES256')
-
         "Bearer #{auth_token}"
       end
 
       def payload
         {
-          iat: Time.now.to_i + iat_fudge_factor,
+          iat: current_timestamp + iat_fudge_factor,
           token: client_token
         }
       end
@@ -47,26 +45,44 @@ module NOMIS
       # error message can only say that the generated JWT token does not
       # validate.
       def validate_keys!
-        client_pub = OpenSSL::PKey::EC.new client_key
-        client_pub.private_key = nil
-        client_pub_base64 = Base64.strict_encode64(client_pub.to_der)
-
-        expected_client_pub = JWT.decode(client_token, nil, nil)[0]['key']
-
-        unless client_pub_base64 == expected_client_pub
-          raise 'Incorrect private key supplied ' \
-                + '(does not match public key within token)'
+        unless client_public_key_base64 == expected_client_public_key
+          raise TokenMismatchError, 
+                'Incorrect private key supplied ' \
+                + '(does not match public key within token)',
+                caller
         end
       end
 
       protected
 
-      def default_client_key(params={})
-        read_client_key_file(params[:client_key_file] || ENV['NOMIS_API_CLIENT_KEY_FILE'])
+      def auth_token
+        JWT.encode(payload, client_key, 'ES256')
+      end
+
+      def client_public_key_base64
+        client_public_key = OpenSSL::PKey::EC.new client_key
+        client_public_key.private_key = nil
+        Base64.strict_encode64(client_public_key.to_der)
+      end
+
+      def expected_client_public_key
+        JWT.decode(client_token, nil, nil)[0]['key']
+      end
+
+      def current_timestamp
+        now || Time.now.to_i
+      end
+
+      def default_client_key(params = {})
+        read_client_key_file(
+          params[:client_key_file] || ENV['NOMIS_API_CLIENT_KEY_FILE']
+        )
       end
       
-      def default_client_token(params={})
-        read_client_key_file(params[:client_token_file] || ENV['NOMIS_API_CLIENT_TOKEN_FILE'])
+      def default_client_token(params = {})
+        read_client_key_file(
+          params[:client_token_file] || ENV['NOMIS_API_CLIENT_TOKEN_FILE']
+        )
       end
 
       def default_iat_fudge_factor(params={})

data/lib/nomis/api/get.rb

@@ -1,7 +1,6 @@
 require 'uri'
 require 'net/http'
 require 'pp'
-require 'byebug'
 
 require 'nomis/api/auth_token'
 require 'nomis/api/parsed_response'

data/lib/nomis/api/token_mismatch_error.rb

@@ -0,0 +1,6 @@
+module NOMIS
+  module API
+    class TokenMismatchError < RuntimeError
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nomis-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Al Davidson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -53,6 +53,7 @@ files:
 - lib/nomis/api/get.rb
 - lib/nomis/api/parsed_response.rb
 - lib/nomis/api/post.rb
+- lib/nomis/api/token_mismatch_error.rb
 - lib/nomis_api_client_ruby.rb
 homepage: http://rubygems.org/gems/nomis_api_client_ruby
 licenses: