panoptes-client 0.4.0 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 738ea26bbdcac1cfd64a537f11210c5dbce0fb18
-  data.tar.gz: 03143cbb89f128160b9659f744572d1bfa05986c
+SHA256:
+  metadata.gz: 4b31b1558519ae640f4ee2504b01797b31ec3758526900bed1c52f0e355f210c
+  data.tar.gz: 87fef50c3aa0669ed3ba57d6acc423f5bfa1c7a2658ce90c2b6c7a038bcfabc5
 SHA512:
-  metadata.gz: 8570661b211f00b0f20ab1b076ab1c033d467c89a495e8b4062081e4c6eb246b57555c76ba449d5e16c08b1674b28a778740f11dbb88ec011f15e803c82e0e4a
-  data.tar.gz: fd0d5ebb58e5521b884abbe5723e2a09c6c69603f829d38b74e6f43fa40750662b646765edd37945f7e88b0f730ef7e45172ee7d53df4e890f7a3c7fd33b04c9
+  metadata.gz: 8bdb6f370c994b60217d16c3f3ef01dc40d09c3b6cc0615fdaed9c044431cfbdd68b2d3ee6fa2a50736a42b303c91f6b1d55374c2e353f9bb44e04c3bb2f13c8
+  data.tar.gz: 1df9b85193256c608b06f21e24db4bea2105c6a74c605967bd3d6ce76c38a662a78dbc96837993246ab32ef594a6965a42d66800d325879ce4cdce729b4c3b5c

data/lib/panoptes/client/authentication.rb

@@ -5,28 +5,28 @@ module Panoptes
     module Authentication
       extend Gem::Deprecate
 
+      attr_reader :payload
+
       def jwt_payload
         raise NotLoggedIn unless @auth[:token]
-        payload, = decode_token(@auth[:token])
-        payload
+        @payload = decode_token(@auth[:token])
       rescue JWT::ExpiredSignature
         raise AuthenticationExpired
       end
 
       def token_contents
-        if !@payload.nil? && expiry_from_payload(@payload) > Time.now.utc
-          @payload.fetch('data', {})
-        elsif @payload.nil?
-          @payload = jwt_payload
-          @expires_at = expiry_from_payload(@payload)
-          @payload.fetch('data', ())
+        if payload_exists? && !payload_expired?
+          # use the cached version of the payload while not expired
+          payload['data']
         else
-          raise AuthenticationExpired
+          # decode the payload from the JWT token
+          jwt_payload['data']
         end
       end
 
       def token_expiry
-        @expires_at || expiry_from_payload(jwt_payload)
+        # always decode and fetch the expiry time from the JWT token
+        Time.at(jwt_payload.fetch('exp',0)).utc
       end
 
       def authenticated?
@@ -34,22 +34,22 @@ module Panoptes
       end
 
       def authenticated_user_login
-        raise NotLoggedIn unless authenticated?
+        ensure_authenticated
         token_contents.fetch('login', nil)
       end
 
       def authenticated_user_display_name
-        raise NotLoggedIn unless authenticated?
+        ensure_authenticated
         token_contents.fetch('dname', nil)
       end
 
       def authenticated_user_id
-        raise NotLoggedIn unless authenticated?
+        ensure_authenticated
         token_contents.fetch('id')
       end
 
       def authenticated_admin?
-        raise NotLoggedIn unless authenticated?
+        ensure_authenticated
         token_contents.fetch('admin', false)
       end
 
@@ -58,12 +58,26 @@ module Panoptes
       end
       deprecate :current_user, :token_contents, 2019, 7
 
-      def jwt_signing_public_key
-        @jwt_signing_public_key ||= OpenSSL::PKey::RSA.new(File.read(@public_key_path))
+      private
+
+      def ensure_authenticated
+        raise NotLoggedIn unless authenticated?
+      end
+
+      def payload_exists?
+        !!@payload
+      end
+
+      def payload_expiry_time
+        @payload_expiry_time ||= Time.at(payload.fetch('exp',0)).utc
       end
 
-      def expiry_from_payload(payload)
-        Time.at(payload.fetch('exp',0)).utc
+      def payload_expired?
+        payload_expiry_time < Time.now.utc
+      end
+
+      def jwt_signing_public_key
+        @jwt_signing_public_key ||= OpenSSL::PKey::RSA.new(File.read(@public_key_path))
       end
 
       def decode_token(token)

data/lib/panoptes/client/version.rb

@@ -1,5 +1,5 @@
 module Panoptes
   class Client
-    VERSION = "0.4.0".freeze
+    VERSION = '1.0.0.pre'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panoptes-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deprecate
@@ -200,12 +200,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: API wrapper for https://panoptes.zooniverse.org