signet 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d922c22c4140c29169cf488634119b758c31ac62770d7125e3cb28de71c7ffe4
-  data.tar.gz: c4ff15f7c7aa2947d0d82dc57baff5b7bfd3b774c46193cc6e5b9b1a989f241f
+  metadata.gz: 680cfcd2752495cc3e2086d74b858d6d279b78a223a2102e1a076736c3dd2fd9
+  data.tar.gz: 3e073eeb03f3017b17ca776cb6c7a1c7b6495cebe61a0931206af608a736eb33
 SHA512:
-  metadata.gz: a0d67014fbcedddc4cd64b3cdba4d4f694e044d20dbe97d92edb1c707dd7adbffbb26fcef483e07b9c9a82b36111b120166553536c0e0bc8912a32a8c96ce4a9
-  data.tar.gz: 431881775a6acb40631aeb05de74c25d8967a70f19e301471de648c290ece266bddc6548f1f4ebb552776706faee7cc6f61f6a2794dea3b4b3ca0e3a30de1a28
+  metadata.gz: 0bd67c59d78d3e1b10f54de27168bc95022b3b36ed001773cc83ba06eb36cfa8a81d244da724952b7c88a4a9a272fa4ab128af9c1774683460392167302777bc
+  data.tar.gz: 4516060a3baced5581ad3534cc13d195a5855c97d4bdbd1fe4a801034ef80d320527c692943cf37ae36d55dd889b0598c37966d9162a5464cd5fac76e8e2b13e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.9.2 (2018-09-12)
+* Update issued_at correctly when it is set simultaneously with expires_in.
+
 ## 0.9.1 (2018-08-29)
 * Warn on EOL ruby versions.
 * Fix DateTime normalization.

data/lib/signet/oauth_2/client.rb

@@ -233,6 +233,11 @@ module Signet
         # set, but this can be used to supply a more precise time.
         self.issued_at = options[:issued_at] if options.has_key?(:issued_at)
 
+        # Special case where we want expires_at to be relative to issued_at
+        if options.has_key?(:issued_at) && options.has_key?(:expires_in)
+          set_relative_expires_at options[:issued_at], options[:expires_in]
+        end
+
         self.access_token = options[:access_token] if options.has_key?(:access_token)
         self.refresh_token = options[:refresh_token] if options.has_key?(:refresh_token)
         self.id_token = options[:id_token] if options.has_key?(:id_token)
@@ -769,7 +774,7 @@ module Signet
 
       ##
       # Returns the timestamp the access token will expire at.
-      # Returns nil if the token does not expire. 
+      # Returns nil if the token does not expire.
       #
       # @return [Time, nil] The access token lifetime.
       def expires_at
@@ -1196,6 +1201,13 @@ module Signet
           fail "Invalid time value #{time}"
         end
       end
+
+      def set_relative_expires_at(issued_at, expires_in)
+        self.issued_at = issued_at
+        # Using local expires_in because if self.expires_in is used, it returns
+        # the time left before the token expires
+        self.expires_at = self.issued_at + expires_in.to_i
+      end
     end
   end
 end

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 9
-      TINY  = 1
+      TINY  = 2
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/signet.gemspec

@@ -37,4 +37,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.9'
 
   s.post_install_message = Signet::VERSION::warn_on_old_ruby_version
+
+  if s.respond_to?(:metadata)
+    s.metadata['changelog_uri'] = 'https://github.com/google/signet/blob/master/CHANGELOG.md'
+    s.metadata['source_code_uri'] = 'https://github.com/google/signet'
+    s.metadata['bug_tracker_uri'] = 'https://github.com/google/signet/issues'
+  end
 end

data/spec/signet/oauth_2/client_spec.rb

@@ -436,6 +436,41 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     expect(@client).to be_expired
   end
 
+  it 'should calculate the expires_at from issued_at when issued_at is set' do
+    expires_in = 3600
+    issued_at = Time.now - expires_in
+    @client.update_token!(
+      :issued_at => issued_at,
+      :expires_in => expires_in
+    )
+    expect(@client.expires_at).to eq issued_at + expires_in
+    expect(@client).to be_expired
+  end
+
+  it 'should calculate expires_at from Time.now when issed_at is NOT set' do
+    expires_in = 3600
+    expires_at = Time.now + expires_in
+    @client.update_token! :expires_in => expires_in
+    expect(@client.expires_at).to be_within(1).of(expires_at)
+    expect(@client).to_not be_expired
+  end
+
+  # This test is to document the way that expires_in has always been used:
+  # If expires_in is set on the client, it always resets the issued_at time
+  # to Time.now
+  it 'sets issued_at to Time.now when expires_in is not set through update_token!' do
+    one_hour = 3600
+    issued_at = Time.now - (2 * one_hour)
+    current_time = Time.now
+
+    @client.issued_at = issued_at
+    @client.expires_in = one_hour
+
+    expect(@client.issued_at).to_not eq issued_at
+    expect(@client.issued_at).to be_within(1).of(current_time)
+    expect(@client).to_not be_expired
+  end
+
   it 'should allow setting expires_at manually' do
     expires_at = Time.now+100
     @client.expires_at = expires_at.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Bob Aman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -214,7 +214,10 @@ files:
 homepage: https://github.com/google/signet/
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/google/signet/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/google/signet
+  bug_tracker_uri: https://github.com/google/signet/issues
 post_install_message: 
 rdoc_options:
 - "--main"