twilio-ruby 4.8.3.edge → 4.9.0.edge

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ba74041c6b5df506291f3cd3be97841c4dba52
-  data.tar.gz: 58945caad468f6be4eac62741b7790cb64d60510
+  metadata.gz: 3df7f4447f76cf5658ab7eecf38d45adffd783e6
+  data.tar.gz: 1d9ed7dc9443d66e611b169d3a02bde26c6d0108
 SHA512:
-  metadata.gz: 3a29ca5d1c2b2b2f2686d6cf0a1e596ccdf82d5e3eeba52784d14425f26338601ed55e3ae1a64e29f7c015347eee890d6b65e75aff26e58093e3b0fd9291e490
-  data.tar.gz: b4ab6292b6018c2f182338ec6c2a3cb709f53b7853d435b1736017c1320e579deaae12d432fdb45ab8e686aa4735b163ee1fe9102bd1ff08b871e09f799dded0
+  metadata.gz: 327717db3f366626c47f3df545cb3263ee387325acff399d881e3e7956948e04638246c2f31a65173040f4bab3adb9e8eda3371643262a3373180fcabc8f2217
+  data.tar.gz: 50c4747eb0c2a2d6008e14ac8552577a256405c854ec5b0b5315a285b506f6c95f2615f86f88f93ab440721ab25fbaff94af2cd3adf55823826b9a9d6b46f3de

data/CHANGES.md

@@ -1,6 +1,13 @@
 twilio-ruby changelog
 =====================
 
+Version 4.9.0.edge
+-------------
+
+Release December 8, 2015
+
+- Make nbf optional
+
 Version 4.4.0
 -------------
 

data/lib/twilio-ruby/util/access_token.rb

@@ -1,12 +1,20 @@
 module Twilio
   module Util
     class AccessToken
-      def initialize(account_sid, signing_key_id, secret, ttl=3600, identity=nil)
+      attr_accessor :account_sid,
+                    :signing_key_id,
+                    :secret,
+                    :ttl,
+                    :identity,
+                    :nbf
+
+      def initialize(account_sid, signing_key_id, secret, ttl=3600, identity=nil, nbf=nil)
         @account_sid = account_sid
         @signing_key_sid = signing_key_id
         @secret = secret
         @ttl = ttl
         @identity = identity
+        @nbf = nbf
         @grants = []
       end
 
@@ -32,10 +40,11 @@ module Twilio
             'jti' => "#{@signing_key_sid}-#{now}",
             'iss' => @signing_key_sid,
             'sub' => @account_sid,
-            'nbf' => now,
             'exp' => now + @ttl,
             'grants' => grants
         }
+        payload['nbf'] = @nbf unless @nbf.nil?
+
         JWT.encode payload, @secret, algorithm, headers
       end
 

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '4.8.3.edge'
+  VERSION = '4.9.0.edge'
 end

data/spec/util/access_token_spec.rb

@@ -10,15 +10,37 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(0)
   end
 
+  it 'should generate a nbf' do
+    now = Time.now.to_i
+    scat = Twilio::Util::AccessToken.new 'AC123', 'SK123','secret'
+    scat.identity = 'abc'
+    scat.nbf = now
+
+    token = scat.to_s
+    expect(token).not_to be_nil
+    payload, header = JWT.decode token, 'secret'
+
+    expect(payload['iss']).to eq('SK123')
+    expect(payload['sub']).to eq('AC123')
+    expect(payload['nbf']).not_to be_nil
+    expect(payload['nbf']).to eq(now)
+    expect(payload['exp']).not_to be_nil
+    expect(payload['exp']).to be >= Time.now.to_i
+    expect(payload['jti']).not_to be_nil
+    expect(payload['jti']).to start_with payload['iss']
+    expect(payload['grants']).not_to be_nil
+    expect(payload['grants'].count).to eq(1)
+    expect(payload['grants']['identity']).to eq('abc')
+  end
+
   it 'should be able to add conversation grant' do
     scat = Twilio::Util::AccessToken.new 'AC123', 'SK123','secret'
     scat.add_grant(Twilio::Util::AccessToken::ConversationsGrant.new)
@@ -29,11 +51,10 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(1)
     expect(payload['grants']['rtc']).not_to be_nil
@@ -49,11 +70,10 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(1)
     expect(payload['grants']['ip_messaging']).not_to be_nil
@@ -70,11 +90,10 @@ describe Twilio::Util::AccessToken do
 
     expect(payload['iss']).to eq('SK123')
     expect(payload['sub']).to eq('AC123')
-    expect(payload['nbf']).not_to be_nil
     expect(payload['exp']).not_to be_nil
-    expect(payload['nbf'] + 3600).to eq(payload['exp'])
+    expect(payload['exp']).to be >= Time.now.to_i
     expect(payload['jti']).not_to be_nil
-    expect("#{payload['iss']}-#{payload['nbf']}").to eq(payload['jti'])
+    expect(payload['jti']).to start_with payload['iss']
     expect(payload['grants']).not_to be_nil
     expect(payload['grants'].count).to eq(2)
     expect(payload['grants']['rtc']).not_to be_nil

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 4.8.3.edge
+  version: 4.9.0.edge
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: A simple library for communicating with the Twilio REST API, building
@@ -76,8 +76,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - AUTHORS.md
 - CHANGES.md
 - Gemfile
@@ -291,27 +291,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - twilio-ruby
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple library for communicating with the Twilio REST API, building TwiML,