identity-toolkit-ruby-client 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99e7fd2191547c175870cb9656f018696d29a94
-  data.tar.gz: 6eb020bd9c8d326ca1790c175ce703528a67e1f1
+  metadata.gz: 2f704bf2aa7be011903fd425170f12aaa67577b6
+  data.tar.gz: d983143a7985d766db8b915c64a9997dc3c691fa
 SHA512:
-  metadata.gz: 5a2657585eef66bde0f66fb1e18af4ccef23ff5b7829d094a6e6a2fe60dcbc315ba7bb2930aaf546f5c2a9adde3f72eaba39696f44c3e72660c4ffbedfe93d14
-  data.tar.gz: 424ace8fdd5c630d0767ac4d31a2f360c468563532b8c686d087e0e79105b1d94d26240ad6795bb00eb1ce43282d7bf22064b75828cea2716534ee6a434f197a
+  metadata.gz: d990ca18b3679a3d53ed9b9d352cb97e4e1c7d90babff6421d91775d0fa7a0d87a3bec6587237ae73b04c207d66f4f890108c582293e1305115140528d83f295
+  data.tar.gz: 7372e91455d36a8ab393eb31b01e5510289ac7f32771bcf80a7b189280df51f29b06a483dddb1d782745a20224ebb3f7bc4b5d476b4b200377fb97b62da8487f

data/README.rdoc

@@ -4,7 +4,7 @@ Google Identity Toolkit (Gitkit) ruby client library is for third party sites to
 
 === Installation
 
-  gem install identity_toolkit_ruby_client
+  gem install gitkit-ruby-client
 
 === Examples
 

data/lib/gitkit_client.rb

@@ -14,7 +14,7 @@
 
 require 'addressable/uri'
 require 'jwt'
-require 'json'
+require 'multi_json'
 require 'rpc_helper'
 require 'uri'
 
@@ -26,7 +26,7 @@ module GitkitLib
     #
     # @param [String] file file name of the json-format config
     def self.create_from_config_file(file)
-      config = JSON.parse File.open(file, 'rb') { |io| io.read }
+      config = MultiJson.load File.open(file, 'rb') { |io| io.read }
       p12key = File.open(config['serviceAccountPrivateKeyFile'], 'rb') {
           |io| io.read }
       new(
@@ -42,7 +42,7 @@ module GitkitLib
     # @param [String] client_id Google oauth2 web client id of this site
     # @param [String] service_account_email Google service account email
     # @param [String] service_account_key Google service account private p12 key
-    # @param [String] widget_url url to host the Gitkit widget
+    # @param [String] widget_url full url to host the Gitkit widget
     # @param [String] server_api_key server-side Google API key
     def initialize(client_id, service_account_email, service_account_key,
         widget_url, server_api_key = nil)
@@ -70,7 +70,7 @@ module GitkitLib
                 [key, OpenSSL::X509::Certificate.new(cert)]}]
           end
           @certificates[key_id].public_key }
-        parsed_token = JWT.decode(token_string, nil, true, &key_finder).first
+        parsed_token, _ = JWT.decode(token_string, nil, true, &key_finder)
         # check expiration time
         if Time.new.to_i > parsed_token['exp']
           return nil, 'token expired'
@@ -147,7 +147,6 @@ module GitkitLib
 
     # Get one-time out-of-band code for ResetPassword/ChangeEmail request
     #
-    # @param [String] full_url the full URL of incoming request
     # @param [Hash{String=>String}] param dict of HTTP POST params
     # @param [String] user_ip end user's IP address
     # @param [String] gitkit_token the gitkit token if user logged in
@@ -158,11 +157,11 @@ module GitkitLib
     #    action: OobAction
     #    response_body: the http body to be returned
     #  }
-    def get_oob_result(full_url, param, user_ip, gitkit_token=nil)
+    def get_oob_result(param, user_ip, gitkit_token=nil)
       if param.has_key? 'action'
         begin
           if param['action'] == 'resetPassword'
-            oob_link = build_oob_link(full_url,
+            oob_link = build_oob_link(
                 password_reset_request(param, user_ip),
                 param['action'])
             return password_reset_response(oob_link, param)
@@ -170,7 +169,7 @@ module GitkitLib
             unless gitkit_token
               return failure_msg('login is required')
             end
-            oob_link = build_oob_link(full_url,
+            oob_link = build_oob_link(
                 change_email_request(param, user_ip, gitkit_token),
                 param['action'])
             return email_change_response(oob_link, param)
@@ -202,11 +201,10 @@ module GitkitLib
       }
     end
 
-    def build_oob_link(full_url, param, mode)
+    def build_oob_link(param, mode)
       code = @rpc_helper.get_oob_code(param)
       if code
-        oob_link = Addressable::URI.parse full_url
-        oob_link.path = @widget_url
+        oob_link = Addressable::URI.parse @widget_url
         oob_link.query_values = { 'mode' => mode, 'oobCode' => code}
         return oob_link.to_s
       end
@@ -214,7 +212,7 @@ module GitkitLib
     end
 
     def failure_msg(msg)
-      {:response_body => {'error' => msg}}.to_json
+      {:response_body => MultiJson.dump({'error' => msg})}
     end
 
     def email_change_response(oob_link, param)
@@ -223,7 +221,7 @@ module GitkitLib
         :newEmail => param['newEmail'],
         :oobLink => oob_link,
         :action => :CHANGE_EMAIL,
-        :response_body => {'success' => true}.to_json
+        :response_body => MultiJson.dump({'success' => true})
       }
     end
 
@@ -232,7 +230,7 @@ module GitkitLib
         :email => param['email'],
         :oobLink => oob_link,
         :action => :RESET_PASSWORD,
-        :response_body => {'success' => true}.to_json
+        :response_body => MultiJson.dump({'success' => true})
       }
     end
   end

data/lib/rpc_helper.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 require 'jwt'
-require 'json'
+require 'multi_json'
 require 'faraday'
 require 'gitkit_client'
 require 'openssl'
@@ -137,7 +137,7 @@ module GitkitLib
         headers = {'Content-type' => 'application/x-www-form-urlencoded'}
         response = @connection.post(RpcHelper::TOKEN_ENDPOINT, post_body,
             headers)
-        @access_token = JSON.parse(response.env[:body])['access_token']
+        @access_token = MultiJson.load(response.env[:body])['access_token']
         @token_issued_at = Time.new.to_i
       end
       @access_token
@@ -162,13 +162,13 @@ module GitkitLib
     # authenticated
     # @return <JSON> the Gitkit api response
     def invoke_gitkit_api(method, params, need_service_account=true)
-      post_body = JSON.generate(params)
+      post_body = MultiJson.dump params
       headers = {'Content-type' => 'application/json'}
       if need_service_account
         @connection.authorization :Bearer, fetch_access_token
       end
       response = @connection.post(GITKIT_API_URL + method, post_body, headers)
-      check_gitkit_error JSON.parse(response.env[:body])
+      check_gitkit_error MultiJson.load(response.env[:body])
     end
 
     # Download the Gitkit public certs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: identity-toolkit-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jin Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -77,8 +77,7 @@ files:
 - lib/gitkit_client.rb
 - lib/rpc_helper.rb
 homepage: https://developers.google.com/identity-toolkit/v3
-licenses:
-- Apache 2.0
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []