rodauth-omniauth 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6cc26306c21226fb3b6f07fcc3bfcc6390160f78aa0c8cbf87ff3e3b1fd2fd4
-  data.tar.gz: 9f3d0493b66cdb851e1b8af0e1d85e57544fcdaa6504509072a4edfdcde24d5f
+  metadata.gz: 294ad80d69ff7fd5fef2a1b2722ca716ae205df852a9398efc423ad350eb7e33
+  data.tar.gz: 7b5d75a069904a4a8780114c9eed4e03a8aa9c1533addfa458c91f77f9568cf8
 SHA512:
-  metadata.gz: c10572574a109db2a9d28ea84239154f7c380b23d4f48f543c3084ae6528c5b2878ed98adab2c9d489ced01ca106cd354b7f5dfa177e496b048c744082ddeb31
-  data.tar.gz: 60cf2d25aa82ccb6a6a9f69c01fca040912df718d952a7ad830e443b89589a11d9855d042298c34c1220548b1a4a3eb96252e992de0d8214b1e43f0f4add08f4
+  metadata.gz: d4765fceb95ccd2808bf1d208d43cf42030b447688768017cb80f480b6e1a6302c382a4e47ce47cba75af03577f5904020529ad36a67355d919ba9252abe0186
+  data.tar.gz: 2c10c017f1bf7fd6813bf7d7aba71f3aa7975cd11e130308a804624441ef8119ca8dbc2a85095e9e9d668cb787b281ee150db4cf8768cdba04613d34cdf3d972

data/README.md

@@ -71,11 +71,18 @@ You can now add authentication links to your login form:
 Assuming you configured the providers correctly, you should now be able to authenticate via an external provider. The `omniauth` feature handles the callback request, automatically creating new identities and verified accounts from those identities as needed.
 
 ```rb
-DB[:accounts].all
-#=> [{ id: 123, status_id: 2, email: "user@example.com" }]
-DB[:account_identities].all
-#=> [{ id: 456, account_id: 123, provider: "facebook", uid: "984346198764" },
-#    { id: 789, account_id: 123, provider: "google", uid: "5871623487134"}]
+Account.all
+#=> [#<Account @values={ id: 123, status_id: 2, email: "user@example.com" }>]
+Account::Identity.all
+#=> [#<Account::Identity @values={ id: 456, account_id: 123, provider: "facebook", uid: "984346198764" }>,
+#    #<Account::Identity @values={ id: 789, account_id: 123, provider: "google", uid: "5871623487134"}>]
+```
+
+The example above assumes you're using [rodauth-model] (automatically setup with [rodauth-rails]), which will define `Account::Identity` model for the `account_identities` table, along with the `identities` association on the `Account` model.
+
+```rb
+account = Account.first
+account.identities #=> [#<Account::Identity ...>, ...]
 ```
 
 Currently, provider login is required to return the user's email address, and account creation is assumed not to require additional fields that need to be entered manually. There is currently also no built-in functionality for connecting/removing external identities when signed in. Both features are planned for future versions.
@@ -166,25 +173,6 @@ omniauth_identities_provider_column :provider
 omniauth_identities_uid_column :uid
 ```
 
-### Model associations
-
-When using the [rodauth-model] gem, an `identities` one-to-many association will be defined on the account model:
-
-```rb
-require "rodauth/model"
-
-class Account < Sequel::Model
-  include Rodauth::Model(RodauthApp.rodauth)
-end
-```
-```rb
-Account.first.identities #=>
-# [
-#   #<Account::Identity id=123 provider="facebook" uid="987434628">,
-#   #<Account::Identity id=456 provider="google" uid="274673644">
-# ]
-```
-
 ## Base
 
 The `omniauth` feature builds on top of the `omniauth_base` feature, which sets up OmniAuth and routes its requests, but has no interaction with the database. So, if you would prefer to handle external logins differently, you can load just the `omniauth_base` feature, and implement your own callback phase.
@@ -422,4 +410,5 @@ Everyone interacting in the rodauth-omniauth project's codebases, issue trackers
 [Rodauth]: https://github.com/jeremyevans/rodauth
 [OmniAuth]: https://github.com/omniauth/omniauth
 [rodauth-model]: https://github.com/janko/rodauth-model
+[rodauth-rails]: https://github.com/janko/rodauth-rails
 [omniauth-oauth2]: https://github.com/omniauth/omniauth-oauth2

data/lib/rodauth/features/omniauth.rb

@@ -204,6 +204,6 @@ end
 
 if defined?(Rodauth::Model)
   Rodauth::Model.register_association(:omniauth) do
-    { name: :identities, type: :many, table: omniauth_identities_table, key: omniauth_identities_id_column }
+    { name: :identities, type: :many, table: omniauth_identities_table, key: omniauth_identities_account_id_column }
   end
 end

data/lib/rodauth/features/omniauth_base.rb

@@ -166,12 +166,13 @@ module Rodauth
     # Makes OmniAuth strategies use the JWT session hash.
     def set_omniauth_jwt_session
       rack_session = request.env["rack.session"]
-      session.keys.each { |k| session[k.to_s] = session.delete(k) } unless scope.opts[:sessions_convert_symbols]
+      session.transform_keys!(&:to_s) unless scope.opts[:sessions_convert_symbols]
       request.env["rack.session"] = session
       yield
     ensure
-      session.keys.each { |k| session[k.to_sym] = session.delete(k) } unless scope.opts[:sessions_convert_symbols]
-      request.env["rack.session"] = rack_session
+      session.transform_keys!(&:to_sym) unless scope.opts[:sessions_convert_symbols]
+      request.env.delete("rack.session")
+      request.env["rack.session"] = rack_session if rack_session
     end
 
     # Makes the Rodauth instance accessible inside OmniAuth strategies

data/rodauth-omniauth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rodauth-omniauth"
-  spec.version       = "0.3.2"
+  spec.version       = "0.3.4"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko@hey.com"]
 
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/janko/rodauth-omniauth"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-omniauth
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rodauth
@@ -205,14 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rodauth extension for logging in and creating account via OmniAuth authentication.