omniauth-icos 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13f3ecbb3353218ade85bc0bb6a053ea85be4f0d
-  data.tar.gz: 8b2e81eb93ca0917bbef7e194fb9f1b673181927
+  metadata.gz: c70d3a121648078ac962f604302607d3bf479761
+  data.tar.gz: ebfac26c55bd1c614b75e704ef48e623dbe309c3
 SHA512:
-  metadata.gz: cb37b76a77d40c857087097074f98462a58da19ed4c9c47550f9930ba3daed42160aedbf513b4cf9f3ef38abc37885272a16742f4626a16ed5c37093f0b5f0fc
-  data.tar.gz: 311eb9f5008312ecae7596a6cd230febcdb8be4467ae745d5f8b29b3a5f9c3839705cc54c5a7ca04ba5e1fea160ff02f4e2c2e8a2f13cbf7519dd1212b0fb233
+  metadata.gz: 031543e2f966eebc79c60b1da78591920f27ad3a3508ef554396497eb9f4d943e1a3fd9aff7a11a71c5c853be726ca48ac1404f07fc2d39d3505a7a6844c36a2
+  data.tar.gz: 9814c558980a4d5dcb4d8e26e2c2df06f40e9c853af9ca94d6f9460f109d7155ef9d3e650577c2cba69ead3badf1ba071bccb5e083f6cefc6771762a5c89de27

data/lib/omniauth-icos/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module ICOS
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

data/lib/omniauth/strategies/icos.rb

@@ -11,7 +11,7 @@ module OmniAuth
 
       option :client_options, {
         authorize_url: '/oauth2/auth',
-        token_url:     '/oauth2/token',
+        token_url:     '/v1/consents/exchange',
         site:          'https://icosid.com'
       }
 
@@ -27,7 +27,7 @@ module OmniAuth
 
       uid { user_info['Id'] }
 
-      info do 
+      info do
         {
           :email                 => user_info['Email'],
           :phone                 => user_info['Phone'],
@@ -35,31 +35,66 @@ module OmniAuth
           :first_name            => user_info['FirstName'],
           :middle_name           => user_info['MiddleName'],
           :last_name             => user_info['LastName'],
-          :county                => user_info['County'],
+          :lang                  => user_info['Lang'],
+          :county_code           => user_info['Country'],
+          :city                  => user_info['City'],
           :citizenship           => user_info['Citizenship'],
           :address               => user_info['Address'],
+          :state                 => user_info['State'],
+          :dob                   => user_info['Dob'],
           :document_number       => user_info['DocumentNumber'],
+          :document_type         => user_info['DocumentType'],
           :use_g2fa              => user_info['UseG2fa'],
-          :globalid_verify       => user_info['GlobalidVerify'],
-          :globalid_agent_verify => user_info['GlobalidAgentVerify'],
-          :netki_status          => user_info['NetkiStatus'],
-          :eth_wallet            => user_info['EthWallet']
+          :gender                => user_info['Gender'],
+          :kyc_status            => user_info['KycStatus'],
+          :kyc_reason            => user_info['KycReason'],
+          :kyc_at                => user_info['KycAt'],
+          :is_verified           => user_info['IsVerified']
         }
       end
-      
+
       extra do
         {
           :raw_info => raw_info
         }
       end
 
-      def build_access_token
-        options.token_params.merge!(:headers => {'Authorization' => basic_auth_header })
-        super
+      def callback_url
+        options[:redirect_uri] || (full_host + script_name + callback_path)
       end
 
-      def basic_auth_header
-        'Basic ' + Base64.strict_encode64("#{options[:client_id]}:#{options[:client_secret]}")
+      def build_access_token
+        params = ::OAuth2::Authenticator.new(client.id, client.secret, :request_body).apply(
+          {
+            'Redirect'     => callback_url,
+            'ClientId'     => options[:client_id],
+            'ClientSecret' => options[:client_secret],
+            'Scopes'       => DEFAULT_SCOPES,
+            'Code'         => request.params['code']
+          }
+        )
+
+        opts = {
+          :raise_errors => options[:raise_errors],
+          :parse => params.delete(:parse),
+          :body => params,
+          :headers => { 'Content-Type' => 'application/x-www-form-urlencoded' }
+        }
+
+        headers = params.delete(:headers) || {}
+        opts[:headers].merge!(headers)
+
+        response = client.request(:post, client.token_url, opts)
+
+        if !response.parsed.is_a?(Hash) || !response.parsed['Result'] || !response.parsed['Result']['access_token']
+          error = ::OmniAuth::Error.new(response)
+          raise(error)
+        end
+
+        body = response.parsed['Result']
+        body['expires_at'] = body['expiry'].to_datetime.in_time_zone
+
+        ::OAuth2::AccessToken.from_hash(client, body)
       end
 
       def compact_full_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-icos
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Nikita Anistratenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth