zaikio-oauth_client 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0941f7172aa5d44ab3548647ddb08818ba3f49b3d16b6362c4763056da0ce81
-  data.tar.gz: d8354f0e4f1e4a29c3340f9db82e6b257f8cd0af611aa856da5c7db35e6d9101
+  metadata.gz: 5423f9566cab7cd383ea7f42fa86c7a899e615be78eb3bf0f374a23742df8106
+  data.tar.gz: 5a2b07e3def1d7d55730767b1145265782d9bcde45fabbddace0ebd783c33915
 SHA512:
-  metadata.gz: 8239d18c9d17d868190adb4d6430241684fb6f8b9333c3b56e28161f9bfe2127a1a6284165559244e507dec7bef4904d4497c100d964057f5fde051e16e754fc
-  data.tar.gz: ba022530c742210508279d61937a3d0f330ecea230682e2d54373dc2479cf1016d95428df33429bafa03dafe8b1cb461f6a3ae5c41c1ffc6ddc8b9eef33257cd
+  metadata.gz: b5e9767b1c46ec96fe4ee6d12efd1b5090f0d032b3e651f2f941ce3ccae5a4151373ba1208a9c169f668cd2452c9701376989848a1465063fb731359d066e3b1
+  data.tar.gz: d14fb1595c1ae862873d4c38fc4ef6cd41b1f29088accca024d59f14f83e628fc91dcf7c70be64d9ccf62ca840c97125720c6b7d8c1873105e51d3b192779fda

data/README.md

@@ -60,7 +60,7 @@ Zaikio::OAuthClient.configure do |config|
   end
 
   config.around_auth do |access_token, block|
-    Zaikio::Directory.with_token(access_token.token) do
+    Zaikio::Hub.with_token(access_token.token) do
       block.call(access_token)
     end
   end
@@ -93,7 +93,7 @@ Configure sidekiq scheduler in `config/sidekiq.yml`:
 
 ### OAuth Flow
 
-From any point in your application you can start using the Zaikio Directory OAuth2 flow with
+From any point in your application you can start using the Zaikio Hub OAuth2 flow with
 
 ```rb
 redirect_to zaikio_oauth_client.new_session_path
@@ -109,10 +109,10 @@ This will redirect the user to the OAuth Authorize endpoint of the Zaikio Direct
 
 The Zaikio gem engine will set a cookie for the user after a successful OAuth flow: `cookies.encrypted[:zaikio_person_id]`.
 
-If you are using for example `Zaikio::Directory::Models`, you can use this snippet to set the current user:
+If you are using for example `Zaikio::Hub::Models`, you can use this snippet to set the current user:
 
 ```ruby
-Current.user ||= Zaikio::Directory::Models::Person.find_by(id: cookies.encrypted[:zaikio_person_id])
+Current.user ||= Zaikio::Hub::Models::Person.find_by(id: cookies.encrypted[:zaikio_person_id])
 ````
 
 You can then use `Current.user` anywhere.
@@ -149,7 +149,7 @@ class ApplicationController < ActionController::Base
     cookies.encrypted[:zaikio_person_id] = access_token.bearer_id unless access_token.organization?
 
     # Sync data on login
-    Zaikio::Directory.with_token(access_token.token) do
+    Zaikio::Hub.with_token(access_token.token) do
       access_token.bearer_klass.find_and_reload!(access_token.bearer_id, includes: :all)
     end
 
@@ -234,14 +234,15 @@ If you use the provided OAuth credentials from above and test this against the S
 
 **Make sure you have the dummy app running locally to validate your changes.**
 
-Make your changes and adjust `version.rb`.
-
-**To push a new release:**
-
-- `gem build zaikio-oauth_client.gemspec`
-- `gem push zaikio-oauth_client-0.1.0.gem`
-*Adjust the version accordingly.*
+- Make your changes and submit a pull request for them
+- Make sure to update `CHANGELOG.md`
 
+To release a new version of the gem:
+- Update the version in `lib/zaikio/oauth_client/version.rb`
+- Update `CHANGELOG.md` to include the new version and its release date
+- Commit and push your changes
+- Create a [new release on GitHub](https://github.com/zaikio/zaikio-directory-models/releases/new)
+- CircleCI will build the Gem package and push it Rubygems for you
 
 ## License
 

data/app/models/zaikio/access_token.rb

@@ -26,7 +26,7 @@ module Zaikio
     # Scopes
     scope :valid, lambda {
       where("expires_at > :now", now: Time.current)
-        .where.not(id: Zaikio::JWTAuth.blacklisted_token_ids)
+        .where.not(id: Zaikio::JWTAuth.revoked_token_ids)
     }
     scope :with_invalid_refresh_token, lambda {
       where("created_at <= ?", Time.current - Zaikio::AccessToken.refresh_token_valid_for)
@@ -36,15 +36,15 @@ module Zaikio
             now: Time.current,
             created_at_max: Time.current - refresh_token_valid_for)
         .where("refresh_token IS NOT NULL")
-        .where.not(id: Zaikio::JWTAuth.blacklisted_token_ids)
+        .where.not(id: Zaikio::JWTAuth.revoked_token_ids)
     }
-    scope :by_bearer, lambda { |bearer_type: "Person", bearer_id:, scopes: []|
+    scope :by_bearer, lambda { |bearer_id:, scopes: [], bearer_type: "Person"|
       where(bearer_type: bearer_type, bearer_id: bearer_id)
         .where("scopes @> ARRAY[?]::varchar[]", scopes)
     }
     scope :usable, lambda { |options|
-      by_bearer(options).valid.or(by_bearer(options).valid_refresh)
-                        .order(expires_at: :desc)
+      by_bearer(**options).valid.or(by_bearer(**options).valid_refresh)
+                          .order(expires_at: :desc)
     }
 
     def expired?
@@ -62,8 +62,8 @@ module Zaikio
     def bearer_klass
       return unless Zaikio.const_defined?("Directory::Models")
 
-      if Zaikio::Directory::Models.configuration.respond_to?(:"#{bearer_type.underscore}_class_name")
-        Zaikio::Directory::Models.configuration.public_send(:"#{bearer_type.underscore}_class_name").constantize
+      if Zaikio::Hub::Models.configuration.respond_to?(:"#{bearer_type.underscore}_class_name")
+        Zaikio::Hub::Models.configuration.public_send(:"#{bearer_type.underscore}_class_name").constantize
       else
         "Zaikio::#{bearer_type}".constantize
       end

data/lib/zaikio/oauth_client.rb

@@ -45,7 +45,7 @@ module Zaikio
         access_token = if options_or_access_token.is_a?(Zaikio::AccessToken)
                          options_or_access_token
                        else
-                         get_access_token(options_or_access_token)
+                         get_access_token(**options_or_access_token)
                        end
 
         return unless block_given?

data/lib/zaikio/oauth_client/configuration.rb

@@ -25,7 +25,7 @@ module Zaikio
       end
 
       def logger
-        @logger ||= Logger.new(STDOUT)
+        @logger ||= Logger.new($stdout)
       end
 
       def register_client(name)

data/lib/zaikio/oauth_client/version.rb

@@ -1,5 +1,5 @@
 module Zaikio
   module OAuthClient
-    VERSION = "0.4.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaikio-oauth_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Zaikio GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -47,7 +47,7 @@ dependencies:
         version: 0.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 0.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -119,10 +119,11 @@ files:
 - lib/zaikio/oauth_client/engine.rb
 - lib/zaikio/oauth_client/test_helper.rb
 - lib/zaikio/oauth_client/version.rb
-homepage: https://www.zaikio.com
+homepage: https://github.com/zaikio/zaikio-oauth_client
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/zaikio/zaikio-oauth_client/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Zaikio Platform Connectivity