tanker-core 2.30.1.alpha.2 → 2.31.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176eda680bd6e4a05f0e56fbfb64a7a159a979a69a005e96e9426d4127d13153
-  data.tar.gz: 98f787f9ba98a4967ea87e3f6de15b31a58320b500ddaa445c490b6106482fc6
+  metadata.gz: 3e052ab81cc7efc4ff4c223486bf8c92500d14120c16362eee5745bb0d990a58
+  data.tar.gz: b9bc2facb9a7f2290cbe4e579c0b900a7b9ad95f853979fc62813f2975d4648f
 SHA512:
-  metadata.gz: 9a77ea22e2dc88803b03cd5650083a208002efed8cd7b372a9a0c6c368830778eb5493ce1152a95e98afe0bf9fa60f708c9a24e56e6d979fb8670c688b5d7682
-  data.tar.gz: 8af984409782e7319dbe6e180bb43bbe770a954dfdaecb5ed31a16fc3e0ea4d94f2e2a8a40fab61a8f5c651d8f93beb7c60984efa39b033a4db780c83c351857
+  metadata.gz: 5a561e723d259795bec3a01cc1d05efcaee57f42357e1fbd9dfdf8e5301156d214a1e1fa46413e383e503c373d10bb525f33abad80f9327ed54b1d1ba949d14b
+  data.tar.gz: 02c800022efc4505a95393bcc2e1c43a988df20a7966ba34834a948b68c6c50e41e99edbc5432141c36b2fdfac8c3e15d3874eeb967b67672c0653a222d16d67

data/lib/tanker/c_tanker/c_lib.rb

@@ -1,10 +1,24 @@
 # frozen_string_literal: true
 
+require 'ffi'
 require 'ffi/platform'
 
-module Tanker::CTanker
-  def self.get_path(name)
-    File.expand_path "../../../vendor/tanker/#{FFI::Platform::OS}-#{FFI::Platform::ARCH}/"\
-                     "#{FFI::Platform::LIBPREFIX}#{name}.#{FFI::Platform::LIBSUFFIX}", __dir__
+module FFI::Library
+  # Marking a function blocking releases the global Ruby lock.
+  # This is required for every function that could invoke a callback (including log handler) in another thread
+  def blocking_attach_function(func, args, returns = nil)
+    attach_function func, args, returns, blocking: true
+  end
+end
+
+module Tanker
+  module CTanker
+    def self.get_path(name)
+      File.expand_path "../../../vendor/tanker/#{FFI::Platform::OS}-#{FFI::Platform::ARCH}/"\
+                       "#{FFI::Platform::LIBPREFIX}#{name}.#{FFI::Platform::LIBSUFFIX}", __dir__
+    end
+
+    extend FFI::Library
+    ffi_lib get_path('ctanker')
   end
 end

data/lib/tanker/c_tanker.rb

@@ -1,30 +1,19 @@
 # frozen_string_literal: true
 
 require 'ffi'
+require_relative 'c_tanker/c_lib'
 require_relative 'core/options'
 require_relative 'sharing_options'
 require_relative 'encryption_options'
 require_relative 'verification_options'
-require_relative 'c_tanker/c_lib'
 require_relative 'c_tanker/c_future'
 require_relative 'c_tanker/c_verification'
 require_relative 'c_tanker/c_verification_method'
 require_relative 'c_tanker/c_log_record'
 require_relative 'c_tanker/c_device_info'
 
-module FFI::Library
-  # Marking a function blocking releases the global Ruby lock.
-  # This is required for every function that could invoke a callback (including log handler) in another thread
-  def blocking_attach_function(func, args, returns = nil)
-    attach_function func, args, returns, blocking: true
-  end
-end
-
 module Tanker
   module CTanker
-    extend FFI::Library
-    ffi_lib get_path('ctanker')
-
     typedef :pointer, :session_pointer
     typedef :pointer, :enc_sess_pointer
     typedef :pointer, :stream_pointer

data/lib/tanker/core/http.rb

@@ -92,9 +92,12 @@ module Tanker
     class Client
       attr_reader :tanker_http_options
 
-      def initialize(sdk_type, sdk_version)
+      def initialize(sdk_type, sdk_version, faraday_adapter)
         @sdk_type = sdk_type
         @sdk_version = sdk_version
+        @conn = Faraday.new do |conn|
+          conn.adapter faraday_adapter || Faraday.default_adapter
+        end
 
         # This could be a proc, but for some reason, ffi gives the wrong type
         # for crequest if we don't specify it explicitly here
@@ -120,7 +123,9 @@ module Tanker
           'X-Tanker-SdkType' => @sdk_type,
           'X-Tanker-SdkVersion' => @sdk_version,
           'Authorization' => request.authorization,
-          'X-Tanker-Instanceid' => request.instance_id
+          'X-Tanker-Instanceid' => request.instance_id,
+          # net-http really wants a Content-Type
+          'Content-Type' => 'application/data'
         }.compact)
 
         request.complete_if_not_canceled do

data/lib/tanker/core/init.rb

@@ -31,7 +31,7 @@ module Tanker
       # Do not spam the console of our users.
       self.class.set_log_handler { |_| } unless self.class.test_and_set_log_handler == 1 # rubocop:disable Lint/EmptyBlock
 
-      @http_client = Http::Client.new options.sdk_type, VERSION
+      @http_client = Http::Client.new options.sdk_type, VERSION, options.faraday_adapter
       options[:http_options] = @http_client.tanker_http_options
 
       @ctanker = CTanker.tanker_create(options).get

data/lib/tanker/core/options.rb

@@ -22,8 +22,9 @@ module Tanker
     SDK_VERSION = CTanker.new_cstring Core::VERSION
 
     attr_reader :sdk_type
+    attr_reader :faraday_adapter
 
-    def initialize(app_id:, url: nil, sdk_type: SDK_TYPE, persistent_path: nil, cache_path: nil)
+    def initialize(app_id:, url: nil, sdk_type: SDK_TYPE, persistent_path: nil, cache_path: nil, faraday_adapter: nil) # rubocop:disable Metrics/ParameterLists
       super()
 
       # NOTE: Instance variables are required to keep the CStrings alive
@@ -33,6 +34,7 @@ module Tanker
       @c_cache_path = CTanker.new_cstring cache_path
       @sdk_type = sdk_type
       @c_sdk_type = CTanker.new_cstring sdk_type
+      @faraday_adapter = faraday_adapter
 
       self[:version] = 4
       self[:app_id] = @c_app_id

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '2.30.1.alpha.2'
+    VERSION = '2.31.0.beta.1'
 
     def self.native_version
       CTanker.tanker_version_string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.30.1.alpha.2
+  version: 2.31.0.beta.1
 platform: ruby
 authors:
 - Tanker team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -134,10 +134,6 @@ files:
 - LICENSE
 - README.rst
 - lib/tanker-core.rb
-- lib/tanker/admin.rb
-- lib/tanker/admin/app.rb
-- lib/tanker/admin/app_update_options.rb
-- lib/tanker/admin/client.rb
 - lib/tanker/c_tanker.rb
 - lib/tanker/c_tanker/c_datastore.rb
 - lib/tanker/c_tanker/c_device_info.rb

data/lib/tanker/admin/app.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Tanker
-  class Admin
-    # Information from the Admin SDK concerning a Tanker application
-    class App
-      attr_reader :admin, :id, :auth_token, :secret
-
-      def initialize(admin:, id:, auth_token:, secret:)
-        @admin = admin
-        @id = id
-        @auth_token = auth_token
-        @secret = secret
-      end
-
-      def get_email_verification_code(email)
-        @admin.get_email_verification_code(@id, @auth_token, email)
-      end
-
-      def get_sms_verification_code(phone_number)
-        @admin.get_sms_verification_code(@id, @auth_token, phone_number)
-      end
-    end
-  end
-end

data/lib/tanker/admin/app_update_options.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Tanker
-  class Admin
-    class AppUpdateOptions
-      attr_accessor :oidc_client_id, :oidc_client_provider, :preverified_verification, :user_enrollment
-
-      def initialize(oidc_client_id: nil, oidc_client_provider: nil,
-                     preverified_verification: nil, user_enrollment: nil)
-        @oidc_client_id = oidc_client_id
-        @oidc_client_provider = oidc_client_provider
-        @preverified_verification = preverified_verification
-        @user_enrollment = user_enrollment
-      end
-
-      def as_json(_options = {})
-        {
-          oidc_client_id: @oidc_client_id,
-          oidc_provider: @oidc_client_provider,
-          preverified_verification_enabled: @preverified_verification,
-          enroll_users_enabled: @user_enrollment
-        }
-      end
-    end
-  end
-end

data/lib/tanker/admin/client.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require 'faraday'
-require 'faraday_middleware'
-
-require_relative 'app'
-require_relative 'app_update_options'
-
-module Tanker
-  class Admin
-    class Client
-      def self.init_conn(conn)
-        conn.request :json
-        conn.response :raise_error
-        ## in case of verbosity need
-        # require 'logger'
-        # conn.response :logger, ::Logger.new(STDOUT), bodies: true
-        conn.response :json
-        conn.adapter :net_http
-        conn
-      end
-
-      def initialize(app_management_token:, app_management_url:, api_url:, environment_name:, trustchain_url:)
-        @app_management_token = app_management_token
-        @app_management_url = app_management_url
-        @api_url = api_url
-        @environment_name = environment_name
-        @trustchain_url = trustchain_url
-        @conn = Faraday.new(url: "#{@app_management_url}/v1/apps") do |conn|
-          conn.request :authorization, 'Bearer', @app_management_token
-          self.class.init_conn(conn)
-        end
-      end
-
-      def create_app(name)
-        response = @conn.post do |req|
-          req.body = { name: name, environment_name: @environment_name }
-          req.headers['Accept'] = 'application/json'
-        end
-        App.new(
-          admin: self,
-          id: response.body['app']['id'],
-          auth_token: response.body['app']['auth_token'],
-          secret: response.body['app']['secret']
-        )
-      end
-
-      def delete_app(app_id)
-        capp_id = Faraday::Utils.escape(app_id)
-        @conn.delete(capp_id)
-      end
-
-      def app_update(app_id, app_update_options)
-        capp_id = Faraday::Utils.escape(app_id)
-        response = @conn.patch(capp_id) do |req|
-          req.body = app_update_options.as_json
-        end
-        response.body
-      end
-
-      def get_email_verification_code(app_id, auth_token, email)
-        conn = Faraday.new(url: @api_url) do |f|
-          self.class.init_conn(f)
-        end
-        response = conn.post('/verification/email/code', { email: email, app_id: app_id, auth_token: auth_token })
-        response.body['verification_code']
-      end
-
-      def get_sms_verification_code(app_id, auth_token, phone_number)
-        conn = Faraday.new(url: @api_url) do |f|
-          self.class.init_conn(f)
-        end
-        response = conn.post('/verification/sms/code',
-                             { phone_number: phone_number, app_id: app_id, auth_token: auth_token })
-        response.body['verification_code']
-      end
-    end
-  end
-end

data/lib/tanker/admin.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'admin/client'
-require_relative 'admin/app'
-require_relative 'admin/app_update_options'