tanker-core 2.29.2.alpha.2 → 2.29.2.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9458de6be8c695fde0d8848504a22d9a43bf5b59991ef54aedef0b16776ea7de
-  data.tar.gz: 4ba6fbf7553dd203398f196c37e584b5a8a7c9199743482de2ef1130414bcad2
+  metadata.gz: 57bda3a7ea4cb2eba52188065a5fa58e080920dd40b912c8149e8a0152d406a0
+  data.tar.gz: d5e28a7e687903b2a80c138f79161d2b32fcc915f68f556ed0b2bfe4f6c8602d
 SHA512:
-  metadata.gz: 1408ee4130243904142f0823bf9ebd997616b55671391f9b243f12a9194ffd28745910f2582492f6ba57ae3176adc469daeeff1f3d6e64bd2fc3013fdbd78ece
-  data.tar.gz: 0babda91b0cd232a3b067121ba85f207f7d511b546eaec63ff7359e3c02e39cc7ad46d64521b233b0d7ad5304d85ab5d92bb40855cba18ea9ddebf4e7278ec7c
+  metadata.gz: f7a51f0d79199fcffedc20dbfe7d91b23f82945985f2382ad276979b5abef591489444b0e6b8a058cead31b73c680ce5aff578a02095e3b5373324e266295f8b
+  data.tar.gz: 7065c8cc8661d5fb74da030b0f44d131a5f0fe8145c23c0afd221c4efd857abafe32835ec213e974adc4b362209602953ac4ba1d7bef9c33170f4efb2713d765

data/lib/tanker/admin/app.rb

@@ -4,21 +4,21 @@ module Tanker
   class Admin
     # Information from the Admin SDK concerning a Tanker application
     class App
-      attr_reader :admin, :id, :auth_token, :secret
+      attr_reader :url, :id, :auth_token, :private_key
 
-      def initialize(admin:, id:, auth_token:, secret:)
-        @admin = admin
+      def initialize(trustchain_url:, id:, auth_token:, private_key:)
+        @trustchain_url = trustchain_url
         @id = id
         @auth_token = auth_token
-        @secret = secret
+        @private_key = private_key
       end
 
       def get_email_verification_code(email)
-        @admin.get_email_verification_code(@id, @auth_token, email)
+        CAdmin.tanker_get_email_verification_code(@trustchain_url, @id, @auth_token, email).get_string
       end
 
       def get_sms_verification_code(phone_number)
-        @admin.get_sms_verification_code(@id, @auth_token, phone_number)
+        CAdmin.tanker_get_sms_verification_code(@trustchain_url, @id, @auth_token, phone_number).get_string
       end
     end
   end

data/lib/tanker/admin/c_admin/c_app_descriptor.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'ffi'
+
+module Tanker
+  class Admin
+    class CAdmin::CAppDescriptor < FFI::ManagedStruct
+      layout :name, :string,
+             :id, :string,
+             :auth_token, :string,
+             :private_key, :string,
+             :public_key, :string
+
+      def get_email_verification_code(email)
+        CTanker.tanker_get_email_verification_code(email).get
+      end
+
+      def get_sms_verification_code(phone_number)
+        CTanker.tanker_get_sms_verification_code(phone_number).get
+      end
+
+      def self.release(ptr)
+        CAdmin.tanker_admin_app_descriptor_free ptr
+      end
+    end
+  end
+end

data/lib/tanker/admin/c_admin/c_app_update_options.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'ffi'
+require 'tanker/c_tanker/c_string'
+
+module Tanker
+  class Admin
+    class AppUpdateOptions < FFI::Struct
+      def initialize(oidc_client_id: nil, oidc_client_provider: nil,
+                     preverified_verification: nil, user_enrollment: nil)
+        super()
+        self[:version] = 4
+        unless oidc_client_id.nil?
+          @oidc_client_id = CTanker.new_cstring oidc_client_id
+          self[:oidc_client_id] = @oidc_client_id
+        end
+        unless oidc_client_provider.nil?
+          @oidc_client_provider = CTanker.new_cstring oidc_client_provider
+          self[:oidc_client_provider] = @oidc_client_provider
+        end
+        unless preverified_verification.nil?
+          boolptr = FFI::MemoryPointer.new(:bool, 1)
+          boolptr.put(:bool, 0, preverified_verification)
+          @preverified_verification = boolptr
+          self[:preverified_verification] = @preverified_verification
+        end
+        unless user_enrollment.nil? # rubocop:disable Style/GuardClause no different than the other parameters
+          boolptr = FFI::MemoryPointer.new(:bool, 1)
+          boolptr.put(:bool, 0, user_enrollment)
+          @user_enrollment = boolptr
+          self[:user_enrollment] = @user_enrollment
+        end
+      end
+
+      layout :version, :uint8,
+             :oidc_client_id, :pointer,
+             :oidc_client_provider, :pointer,
+             :preverified_verification, :pointer,
+             :user_enrollment, :pointer
+    end
+  end
+end

data/lib/tanker/admin/c_admin.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'ffi'
+require 'tanker/c_tanker/c_future'
+require 'tanker/c_tanker/c_lib'
+require_relative 'c_admin/c_app_update_options'
+
+module Tanker
+  class Admin
+    module CAdmin
+      extend FFI::Library
+
+      ffi_lib Tanker::CTanker.get_path('tanker_admin-c')
+      typedef :pointer, :admin_pointer
+
+      # NOTE: We use those CFutures with the tanker_future_* functions exposed by CTanker,
+      # this is safe because we only do simple synchronous blocking calls, without using tanker_future_then.
+
+      attach_function :tanker_admin_connect, [:string, :string, :string], CTanker::CFuture
+      attach_function :tanker_admin_create_app, [:admin_pointer, :string], CTanker::CFuture
+      attach_function :tanker_admin_delete_app, [:admin_pointer, :string], CTanker::CFuture
+      attach_function :tanker_admin_destroy, [:admin_pointer], CTanker::CFuture
+      attach_function :tanker_admin_app_descriptor_free, [:pointer], :void
+      attach_function :tanker_admin_app_update, [:admin_pointer, :string,
+                                                 Tanker::Admin::AppUpdateOptions], CTanker::CFuture
+      attach_function :tanker_get_email_verification_code, [:string, :string, :string, :string], CTanker::CFuture
+      attach_function :tanker_get_sms_verification_code, [:string, :string, :string, :string], CTanker::CFuture
+    end
+
+    private_constant :CAdmin
+  end
+end

data/lib/tanker/admin.rb

@@ -1,5 +1,59 @@
 # frozen_string_literal: true
 
-require_relative 'admin/client'
+require 'ffi'
+require_relative 'admin/c_admin'
+require_relative 'admin/c_admin/c_app_descriptor'
+require_relative 'admin/c_admin/c_app_update_options'
 require_relative 'admin/app'
-require_relative 'admin/app_update_options'
+
+module Tanker
+  class Admin
+    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
+    end
+
+    # Authenticate to the Tanker admin server API
+    # This must be called before doing any other operation
+    def connect
+      @cadmin = CAdmin.tanker_admin_connect(@app_management_url, @app_management_token, @environment_name).get
+      cadmin_addr = @cadmin.address
+      ObjectSpace.define_finalizer(@cadmin) do |_|
+        CAdmin.tanker_admin_destroy(FFI::Pointer.new(:void, cadmin_addr)).get
+      end
+    end
+
+    def create_app(name)
+      assert_connected
+      descriptor_ptr = CAdmin.tanker_admin_create_app(@cadmin, name).get
+      descriptor = CAdmin::CAppDescriptor.new(descriptor_ptr)
+      App.new(
+        trustchain_url: @trustchain_url,
+        id: descriptor[:id],
+        auth_token: descriptor[:auth_token],
+        private_key: descriptor[:private_key]
+      )
+    end
+
+    def delete_app(app_id)
+      assert_connected
+      CAdmin.tanker_admin_delete_app(@cadmin, app_id).get
+    end
+
+    def app_update(app_id, app_update_options)
+      assert_connected
+      CAdmin.tanker_admin_app_update(@cadmin, app_id, app_update_options).get
+    end
+
+    private
+
+    def assert_connected
+      raise 'You need to connect() before using the admin API!' if @cadmin.nil?
+    end
+  end
+
+  private_constant :Admin
+end

data/lib/tanker/core/session.rb

@@ -41,7 +41,7 @@ module Tanker
 
       method_base_addr = method_list_ptr.read_pointer
       method_list = count.times.map do |i|
-        method_ptr = method_base_addr + (i * CTanker::CVerificationMethod.size)
+        method_ptr = method_base_addr + i * CTanker::CVerificationMethod.size
         CTanker::CVerificationMethod.new(method_ptr).to_verification_method
       end
       CTanker.tanker_free_verification_method_list method_list_ptr
@@ -58,7 +58,7 @@ module Tanker
 
       method_base_addr = device_list_ptr.read_pointer
       device_info_list = count.times.map do |i|
-        method_ptr = method_base_addr + (i * CTanker::CDeviceInfo.size)
+        method_ptr = method_base_addr + i * CTanker::CDeviceInfo.size
         CTanker::CDeviceInfo.new(method_ptr)
       end
       CTanker.tanker_free_device_list device_list_ptr

data/lib/tanker/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.29.2.alpha.2
+  version: 2.29.2.beta.1
 platform: ruby
 authors:
 - Tanker team
@@ -136,8 +136,9 @@ files:
 - 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/admin/c_admin.rb
+- lib/tanker/admin/c_admin/c_app_descriptor.rb
+- lib/tanker/admin/c_admin/c_app_update_options.rb
 - lib/tanker/c_tanker.rb
 - lib/tanker/c_tanker/c_backends.rb
 - lib/tanker/c_tanker/c_device_info.rb
@@ -175,7 +176,6 @@ licenses:
 metadata:
   homepage_uri: https://tanker.io
   source_code_uri: https://github.com/TankerHQ/sdk-ruby
-  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

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