boxr 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0665e63cc6208e2b553601a6a1748b3ab7e0b4b6
-  data.tar.gz: 2161c7d7914825edf273d40c1e576851bb766199
+  metadata.gz: 527dd92dd98452269357273594b57fd009e875c8
+  data.tar.gz: 814f84b862988ba3fc7df51610bc4cc182908a4c
 SHA512:
-  metadata.gz: ed18bbde850f3662f24feb12b3e8243e73d2af181893a80076c006197eb949b7daba26a0919b3492dbcda4358993b24d4468a20d8c39aaab7e3de284ce1e6acf
-  data.tar.gz: 2d590a62dc56694c53a5c24b5d59e32ced3ed081173968763c73c700f517e25f0273481a5d66731c2abf7617d5dafb1e37659cbd51f703917752c823bbba07db
+  metadata.gz: b363f469d80d454db40a5ff53fe4ff39568ca3c1ff7bbc959efa8bb5c4138822ad3e4c56affbe3079b842694040ad054891366a7893322ee7d4277e1167b4881
+  data.tar.gz: e7badddaada9d1f4d34c2d7d144df62ebb84a74bcbf59dc2856099e0f1ea5ac67966b23660128e55f1815a4d015b4a0aa9dd62f932685992813d1649271c3612

data/README.md

@@ -84,7 +84,17 @@ client = Boxr::Client.new('zX3UjFwNerOy5PSWc2WI8aJgMHtAjs8T',
 ```
 Here's the complete method signature to initialize an instance of Boxr::Client
 ```ruby
-initialize(access_token=ENV['BOX_DEVELOPER_TOKEN'], refresh_token: nil, box_client_id: ENV['BOX_CLIENT_ID'], box_client_secret: ENV['BOX_CLIENT_SECRET'], identifier: nil, as_user: nil, &token_refresh_listener)
+initialize( access_token=ENV['BOX_DEVELOPER_TOKEN'], 
+            refresh_token: nil, 
+            client_id: ENV['BOX_CLIENT_ID'], 
+            client_secret: ENV['BOX_CLIENT_SECRET'],
+            enterprise_id: ENV['BOX_ENTERPRISE_ID'],
+            jwt_private_key: ENV['JWT_PRIVATE_KEY'], 
+            jwt_private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'],
+            jwt_public_key_id: ENV['JWT_PUBLIC_KEY_ID'],
+            identifier: nil, 
+            as_user: nil, 
+            &token_refresh_listener)
 ```
   
 ### A quick example
@@ -116,9 +126,9 @@ Boxr::refresh_tokens(refresh_token, client_id: ENV['BOX_CLIENT_ID'], client_secr
 Boxr::revoke_tokens(token, client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
 
 #JWT methods
-Boxr::get_enterprise_token(private_key: ENV['JWT_PRIVATE_KEY'], private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'], enterprise_id: ENV['BOX_ENTERPRISE_ID'], client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
+Boxr::get_enterprise_token(private_key: ENV['JWT_PRIVATE_KEY'], private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'], public_key_id: ENV['JWT_PUBLIC_KEY_ID'], enterprise_id: ENV['BOX_ENTERPRISE_ID'], client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
 
-Boxr::get_user_token(user_id, private_key: ENV['JWT_PRIVATE_KEY'], private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'], client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
+Boxr::get_user_token(user_id, private_key: ENV['JWT_PRIVATE_KEY'], private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'], public_key_id: ENV['JWT_PUBLIC_KEY_ID'], client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
 ```
 #### [Folders](https://developers.box.com/docs/#folders)
 ```ruby

data/examples/remove_collaborators.rb

@@ -0,0 +1,24 @@
+require 'dotenv'; Dotenv.load("../.env")
+require 'awesome_print'
+require 'boxr'
+
+box_client = Boxr::Client.new(ENV['BOX_DEVELOPER_TOKEN'])
+
+current_user_id = box_client.me.id
+
+folders = box_client.root_folder_items(fields:[:owned_by, :name]).folders
+owned_folders = folders.select{|f| f.owned_by.id == current_user_id}
+
+removed_count = 0
+owned_folders.each do |f|
+  puts "Checking folder '#{f.name}'"
+  collabs = box_client.folder_collaborations(f, fields:[:accessible_by])
+  collabs.each do |c|
+    box_client.remove_collaboration(c)
+    removed_count += 1
+    puts "\t removed collaboration with the #{c.accessible_by.type} #{c.accessible_by.name}"
+  end
+end
+
+puts
+puts "Removed #{removed_count} collaborations from #{owned_folders.count} folders"

data/lib/boxr/auth.rb

@@ -25,16 +25,17 @@ module Boxr
   end
 
   def self.get_enterprise_token(private_key: ENV['JWT_PRIVATE_KEY'], private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'],
-                                enterprise_id: ENV['BOX_ENTERPRISE_ID'], client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
+                                public_key_id: ENV['JWT_PUBLIC_KEY_ID'], enterprise_id: ENV['BOX_ENTERPRISE_ID'], 
+                                client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
     unlocked_private_key = unlock_key(private_key, private_key_password)
-    assertion = jwt_assertion(unlocked_private_key, client_id, enterprise_id, "enterprise")
+    assertion = jwt_assertion(unlocked_private_key, client_id, enterprise_id, "enterprise", public_key_id)
     get_token(grant_type: JWT_GRANT_TYPE, assertion: assertion, client_id: client_id, client_secret: client_secret)
   end
 
   def self.get_user_token(user_id, private_key: ENV['JWT_PRIVATE_KEY'], private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'],
-                          client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
+                          public_key_id: ENV['JWT_PUBLIC_KEY_ID'], client_id: ENV['BOX_CLIENT_ID'], client_secret: ENV['BOX_CLIENT_SECRET'])
     unlocked_private_key = unlock_key(private_key, private_key_password)
-    assertion = jwt_assertion(unlocked_private_key, client_id, user_id, "user")
+    assertion = jwt_assertion(unlocked_private_key, client_id, user_id, "user", public_key_id)
     get_token(grant_type: JWT_GRANT_TYPE, assertion: assertion, client_id: client_id, client_secret: client_secret)
   end
 
@@ -61,7 +62,7 @@ module Boxr
   private
 
 
-  def self.jwt_assertion(private_key, iss, sub, box_sub_type)
+  def self.jwt_assertion(private_key, iss, sub, box_sub_type, public_key_id)
     payload = {
       iss: iss,
       sub: sub,
@@ -70,8 +71,11 @@ module Boxr
       jti: SecureRandom.hex(64),
       exp: (Time.now.utc + 10).to_i
     }
+
+    additional_headers = {}
+    additional_headers['kid'] = public_key_id unless public_key_id.nil?
     
-    JWT.encode(payload, private_key, "RS256")
+    JWT.encode(payload, private_key, "RS256", additional_headers)
   end
 
   def self.auth_post(uri, body)

data/lib/boxr/client.rb

@@ -63,6 +63,7 @@ module Boxr
                     enterprise_id: ENV['BOX_ENTERPRISE_ID'],
                     jwt_private_key: ENV['JWT_PRIVATE_KEY'], 
                     jwt_private_key_password: ENV['JWT_PRIVATE_KEY_PASSWORD'],
+                    jwt_public_key_id: ENV['JWT_PUBLIC_KEY_ID'],
                     identifier: nil, 
                     as_user: nil, 
                     &token_refresh_listener)
@@ -76,6 +77,7 @@ module Boxr
       @enterprise_id = enterprise_id
       @jwt_private_key = jwt_private_key
       @jwt_private_key_password = jwt_private_key_password
+      @jwt_public_key_id = jwt_public_key_id
       @identifier = identifier
       @as_user_id = ensure_id(as_user)
       @token_refresh_listener = token_refresh_listener
@@ -214,10 +216,10 @@ module Boxr
             @token_refresh_listener.call(@access_token, @refresh_token, @identifier) if @token_refresh_listener
           else
             if @as_user_id
-              new_token = Boxr::get_user_token(@as_user_id, private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, client_id: @client_id, client_secret: @client_secret)
+              new_token = Boxr::get_user_token(@as_user_id, private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, public_key_id: @jwt_public_key_id, client_id: @client_id, client_secret: @client_secret)
               @access_token = new_token.access_token
             else
-              new_token = Boxr::get_enterprise_token(private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, enterprise_id: @enterprise_id, client_id: @client_id, client_secret: @client_secret)
+              new_token = Boxr::get_enterprise_token(private_key: @jwt_private_key, private_key_password: @jwt_private_key_password, public_key_id: @jwt_public_key_id, enterprise_id: @enterprise_id, client_id: @client_id, client_secret: @client_secret)
               @access_token = new_token.access_token
             end
           end

data/lib/boxr/version.rb

@@ -1,3 +1,3 @@
 module Boxr
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxr
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Chad Burnette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - examples/enterprise_events.rb
 - examples/jwt_auth.rb
 - examples/oauth.rb
+- examples/remove_collaborators.rb
 - examples/use_events_to_send_sms.rb
 - examples/use_events_to_warn_about_sharing.rb
 - examples/user_events.rb
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby client library for the Box V2 Content API that covers 100% of the