zaikio-hub 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb7e370ad9b9dbb15d7e6637293d95f33cefc3d48b255aafd1d88f9607f77fc
-  data.tar.gz: 995f65525b2baf40b34c2cc8d7eaf1685e201a7fbca67fc3834189140b822ca2
+  metadata.gz: e6de6ed1ed5cb7442b72ffa036df6de0cf7f371d59d52018b4458850b7e71848
+  data.tar.gz: 5dc770e601267c847094fdb07875651529ec14458676c5d5be558af9c0d15c39
 SHA512:
-  metadata.gz: ca9c4d829d55480f69cfa5b619d8d471486ac15ad1b5a8bc4aa9c4b2ada5508948be81b82ef0ce309c21d09d427d604c0352add0309d2f08f5ea5fd09a268fc0
-  data.tar.gz: 0a5f4048cdf0b65e5f42cae0e4da1c18ed5fe7d73232b098956de8cbad736f4fde4998abce70d14e54992213d9a3dd5a54a5dcf3d60835b40f76cdcc313e766a
+  metadata.gz: 2b168642b4f8c6ac5607602a7e2237224e98fe52b4991c3f06b3a61591eeeacb6a6d76a60f63acaa272fe55cb9ee43f42f0a7aea871a3eeca7a2a770abc5f8ae
+  data.tar.gz: 4aca04231bccaf9dc4d85ebf752ef4663f365cc7bc788a8b55d979983047e4eb78e3978bf2bd28ef274186f7408ce2d5288941b08e4bdb40329ed6468ab000dc

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2022-08-15
+
+* Update `zaikio-client-helpers` and reuse logic to use `Zaikio::Client.with_token`
+
 ## [0.9.1] - 2022-01-05
 
 * Fix warning about redefined methods in BasicAuthMiddleware

data/lib/zaikio/hub/client.rb

@@ -1,3 +1,5 @@
+require "jwt"
+
 module Zaikio
   module Hub
     class RequestWrapper

data/lib/zaikio/hub/configuration.rb

@@ -2,38 +2,15 @@ require "logger"
 
 module Zaikio
   module Hub
-    class Configuration
-      HOSTS = {
-        development: "https://hub.zaikio.test",
-        test: "https://hub.zaikio.test",
-        staging: "https://hub.staging.zaikio.com",
-        sandbox: "https://hub.sandbox.zaikio.com",
-        production: "https://hub.zaikio.com"
-      }.freeze
-
-      attr_accessor :host
-      attr_reader :environment
-      attr_writer :logger
-
-      def initialize
-        @environment = :sandbox
-      end
-
-      def logger
-        @logger ||= Logger.new($stdout)
-      end
-
-      def environment=(env)
-        @environment = env.to_sym
-        @host = host_for(environment)
-      end
-
-      private
-
-      def host_for(environment)
-        HOSTS.fetch(environment) do
-          raise StandardError.new, "Invalid Zaikio::Hub environment '#{environment}'"
-        end
+    class Configuration < Zaikio::Client::Helpers::Configuration
+      def self.hosts
+        {
+          development: "https://hub.zaikio.test/api/v1",
+          test: "https://hub.zaikio.test/api/v1",
+          staging: "https://hub.staging.zaikio.com/api/v1",
+          sandbox: "https://hub.sandbox.zaikio.com/api/v1",
+          production: "https://hub.zaikio.com/api/v1"
+        }.freeze
       end
     end
   end

data/lib/zaikio/hub/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module Hub
-    VERSION = "0.9.1".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/lib/zaikio/hub.rb

@@ -3,7 +3,6 @@ require "spyke"
 require "zaikio-client-helpers"
 
 require "zaikio/hub/configuration"
-require "zaikio/hub/authorization_middleware"
 require "zaikio/hub/basic_auth_middleware"
 
 # Models
@@ -44,11 +43,8 @@ module Zaikio
         Base.connection = create_connection
       end
 
-      def with_token(token)
-        AuthorizationMiddleware.token = token
-        yield
-      ensure
-        AuthorizationMiddleware.reset_token
+      def with_token(token, &block)
+        Zaikio::Client.with_token(token, &block)
       end
 
       def with_basic_auth(login, password)
@@ -59,23 +55,20 @@ module Zaikio
       end
 
       def current_token_data
-        return unless AuthorizationMiddleware.token
+        return unless Zaikio::Client::Helpers::AuthorizationMiddleware.token
 
-        payload = JWT.decode(AuthorizationMiddleware.token, nil, false).first
+        payload = JWT.decode(
+          Zaikio::Client::Helpers::AuthorizationMiddleware.token,
+          nil,
+          false
+        ).first
 
         create_token_data(payload)
       end
 
       def create_connection
-        self.connection = Faraday.new(url: "#{configuration.host}/api/v1",
-                                      ssl: { verify: configuration.environment != :test }) do |c|
-          c.request     :json
-          c.response    :logger, configuration&.logger, headers: false
-          c.use         Zaikio::Client::Helpers::Pagination::FaradayMiddleware
-          c.use         Zaikio::Client::Helpers::JSONParser
-          c.use         AuthorizationMiddleware
-          c.use         BasicAuthMiddleware
-          c.adapter     Faraday.default_adapter
+        self.connection = Zaikio::Client.create_connection(configuration).tap do |c|
+          c.use BasicAuthMiddleware
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-hub
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -35,7 +35,7 @@ dependencies:
         version: 2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: 2.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Ruby API Client for Zaikio's Hub
 email:
 - op@crispymtn.com
@@ -137,7 +137,6 @@ files:
 - lib/zaikio/hub/address.rb
 - lib/zaikio/hub/app.rb
 - lib/zaikio/hub/asset.rb
-- lib/zaikio/hub/authorization_middleware.rb
 - lib/zaikio/hub/base.rb
 - lib/zaikio/hub/basic_auth_middleware.rb
 - lib/zaikio/hub/business_relationship.rb

data/lib/zaikio/hub/authorization_middleware.rb

@@ -1,32 +0,0 @@
-require "faraday"
-require "jwt"
-require "concurrent"
-
-module Zaikio
-  module Hub
-    class AuthorizationMiddleware < Faraday::Middleware
-      def self.token
-        @token ||= Concurrent::ThreadLocalVar.new { nil }
-        @token.value
-      end
-
-      def self.token=(value)
-        @token ||= Concurrent::ThreadLocalVar.new { nil }
-        @token.value = value
-      end
-
-      def self.reset_token
-        self.token = nil
-      end
-
-      def call(request_env)
-        if self.class.token
-          request_env[:request_headers]["Authorization"] = "Bearer #{self.class.token}"
-        end
-
-        @app.call(request_env).on_complete do |response_env|
-        end
-      end
-    end
-  end
-end