zaikio-hub 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6de6ed1ed5cb7442b72ffa036df6de0cf7f371d59d52018b4458850b7e71848
-  data.tar.gz: 5dc770e601267c847094fdb07875651529ec14458676c5d5be558af9c0d15c39
+  metadata.gz: 4a47f0490eda39c0fd1650ea60e0e46f88d4867a40448613f7665bb41b2677ce
+  data.tar.gz: 7f9b32bb341193d459e77b694d75152bd2026248661de28155683578f5e72fe2
 SHA512:
-  metadata.gz: 2b168642b4f8c6ac5607602a7e2237224e98fe52b4991c3f06b3a61591eeeacb6a6d76a60f63acaa272fe55cb9ee43f42f0a7aea871a3eeca7a2a770abc5f8ae
-  data.tar.gz: 4aca04231bccaf9dc4d85ebf752ef4663f365cc7bc788a8b55d979983047e4eb78e3978bf2bd28ef274186f7408ce2d5288941b08e4bdb40329ed6468ab000dc
+  metadata.gz: 9840f132efc25c081a7576aac95dd64f6a6c433f346cf10e8345540f7593a7aec2540905aac201d1868e7f14cc3c8445fb63e116d07cc8e1fabb4801f1964aec
+  data.tar.gz: ed6060c8af4aaf2b8899f0a76d70a4eec176b320d359c253e8a6cd0a17d02a573a97181ed0bed158026850e4e6c76f0694ccec357f2c2f2dfcea57a00ec2a825

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.1] - 2022-10-13
+
+* Added `subscription_url` attribute in `Subscription`
+
+## [0.11.0] - 2022-08-30
+
+* Extract token data logic into its own `Zaikio::Hub::TokenData` class
+  This also exposes the `sub` attribute of the token as `TokenData#subject`.
+* Support newer versions of `jwt` and `spyke`
+
 ## [0.10.0] - 2022-08-15
 
 * Update `zaikio-client-helpers` and reuse logic to use `Zaikio::Client.with_token`
@@ -90,7 +100,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added subscriptions (migration required)
 
-[Unreleased]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.9.0..HEAD
+[Unreleased]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.11.1..HEAD
+[0.11.1]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.11.0..v0.11.1
+[0.11.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.10.0..v0.11.0
+[0.10.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.9.0..v0.10.0
 [0.9.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.8.0..v0.9.0
 [0.8.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.7.0..v0.8.0
 [0.7.0]: https://github.com/zaikio/zaikio-hub-ruby/compare/v0.6.2..v0.7.0

data/lib/zaikio/hub/subscription.rb

@@ -9,7 +9,7 @@ module Zaikio
       attributes :updated_at, :created_at, :subscriber_type, :subscriber_id,
                  :status, :app_name, :activated_at, :last_billed_at,
                  :last_paid_at, :trial_ended_at, :plan, :plan_name, :preceding_plan,
-                 :changed_plan_at, :usages_in_current_billing_period
+                 :changed_plan_at, :subscripton_url, :usages_in_current_billing_period
 
       def initialize(attributes = {})
         if attributes["subscriber_id"]

data/lib/zaikio/hub/token_data.rb

@@ -0,0 +1,51 @@
+module Zaikio
+  module Hub
+    class TokenData
+      attr_reader :audience, :on_behalf_of, :subject, :scopes
+
+      def self.from(payload)
+        subjects = payload["sub"].split(">")
+
+        new(
+          audience: payload["aud"].first,
+          on_behalf_of: subjects.first,
+          subject: subjects.last,
+          scopes: payload["scope"]
+        )
+      end
+
+      def initialize(audience:, on_behalf_of:, subject:, scopes:)
+        @audience = audience
+        @on_behalf_of = on_behalf_of
+        @subject = subject
+        @scopes = scopes
+      end
+
+      def on_behalf_of_type
+        @on_behalf_of_type ||= type_for(:on_behalf_of)
+      end
+
+      def on_behalf_of_id
+        @on_behalf_of_id ||= id_for(:on_behalf_of)
+      end
+
+      def subject_type
+        @subject_type ||= type_for(:subject)
+      end
+
+      def subject_id
+        @subject_id ||= id_for(:subject)
+      end
+
+      private
+
+      def type_for(key)
+        public_send(key).split("/").first
+      end
+
+      def id_for(key)
+        public_send(key).split("/").last
+      end
+    end
+  end
+end

data/lib/zaikio/hub/version.rb

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

data/lib/zaikio/hub.rb

@@ -27,6 +27,7 @@ require "zaikio/hub/connection"
 require "zaikio/hub/app"
 require "zaikio/hub/subscription"
 require "zaikio/hub/test_account"
+require "zaikio/hub/token_data"
 
 module Zaikio
   module Hub
@@ -73,15 +74,7 @@ module Zaikio
       end
 
       def create_token_data(payload)
-        subjects = payload["sub"].split(">")
-
-        OpenStruct.new(
-          audience: payload["aud"].first,
-          on_behalf_of_id: subjects.first.split("/").last,
-          subject_id: subjects.last.split("/").last,
-          subject_type: subjects.last.split("/").first,
-          scopes: payload["scope"]
-        )
+        TokenData.from(payload)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-hub
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - crispymtn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-10-13 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.5.0
+        version: 2.6.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.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - lib/zaikio/hub/specialist.rb
 - lib/zaikio/hub/subscription.rb
 - lib/zaikio/hub/test_account.rb
+- lib/zaikio/hub/token_data.rb
 - lib/zaikio/hub/version.rb
 homepage: https://www.zaikio.com/
 licenses: