rodauth-omniauth 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b889e9c675d3fd02f65444f581e44965cb84982dd136fb912a5c9e6fb67c8c
-  data.tar.gz: 12a5f50598b671065998b012b9c54997dffa225d5d208d0a25ea90a48bfe3e8b
+  metadata.gz: bcd1857e0bfd2329c4df0476d8f5091bac5f45c9bd47de6c8c3ef53a99bf0a64
+  data.tar.gz: 57ddd4e9b6e8baf00b66da1f580b01762a0c118f7c962f520a026f6ef94bbfc3
 SHA512:
-  metadata.gz: f54a94233c789532139f2e07173e5162209674cf8f90c441df0e603b49b5840b4edad89a0b2e7f9a48c25856ba2d64c9dfed31ff6e61ad219d1ee2725a0d8c03
-  data.tar.gz: c7d3c6db0088e544890cf7be482038d6c9f52c42a95082a5cc5d5bc1ba2dcf92ec7614d6c23b793f1814ac4ffb1272d280d67c527d023d1d437705a5383b608d
+  metadata.gz: 9bebec705884e246bd20bee55771711d3fff5d82c9c7f711099e09ac1196e2af8ce0c5d9e1456035da429e33c7439d7ae8c2350b6b33c6081c54f74a93992b74
+  data.tar.gz: 53be14c4e20dff0c17e988b46cc7e0c700b810c6fc7a4440eb94a63abeee9659f9ad880427ce7205dd0fe9c6757b6e48a6e1e99411b1304dba8f011327936246

data/README.md

@@ -55,7 +55,8 @@ plugin :rodauth do
 end
 ```
 
-It is important to note that `rodauth-omniauth` requires OmniAuth 2.x, and as such, is only compatible with omniauth gems that use the same.
+> [!NOTE]
+> It is important to note that `rodauth-omniauth` requires OmniAuth 2.x, so it's only compatible with providers gems that support it.
 
 You can now add authentication links to your login form:
 
@@ -126,7 +127,7 @@ omniauth_login_failure_redirect { require_login_redirect }
 
 ### Account creation
 
-Accounts created via external login are automatically verified, because it's assumed your email address was verified by the external provider. If you want to use extra user information for account creation, you can do so via hooks:
+Accounts created via external login are automatically verified, because it's assumed your email address was verified by the external provider. If you want to add extra user information to created accounts, you can do so via hooks:
 
 ```rb
 before_omniauth_create_account { account[:name] = omniauth_name }
@@ -136,7 +137,16 @@ after_omniauth_create_account do
 end
 ```
 
-When the account is closed, its external identities are automatically deleted from the database.
+You might want to disable automatic account creation in certain cases. For example, if you're showing OmniAuth login links on both login and registration pages, you might want OmniAuth login on the login page to only log into existing accounts. You could configure this so that it's controlled via a query parameter:
+
+```rb
+# somewhere in your view template:
+rodauth.omniauth_request_path(:google, action: "login") #=> "/auth/github?action=login"
+```
+```rb
+# in your Rodauth configuration:
+omniauth_create_account? { omniauth_params["action"] != "login" }
+```
 
 ### Identity data
 

data/lib/rodauth/features/omniauth.rb

@@ -11,6 +11,7 @@ module Rodauth
     after :omniauth_create_account
 
     error_flash "The account matching the external identity is currently awaiting verification", :omniauth_login_unverified_account
+    error_flash "There is no existing account matching the external identity", :omniauth_login_no_matching_account
 
     redirect(:omniauth_login_failure) { require_login_redirect }
 
@@ -22,6 +23,7 @@ module Rodauth
 
     auth_value_methods(
       :omniauth_verify_account?,
+      :omniauth_create_account?,
     )
 
     auth_methods(
@@ -76,11 +78,16 @@ module Rodauth
       end
 
       transaction do
-        unless account
-          omniauth_new_account
-          before_omniauth_create_account
-          omniauth_save_account
-          after_omniauth_create_account
+        if !account
+          if omniauth_create_account?
+            omniauth_new_account
+            before_omniauth_create_account
+            omniauth_save_account
+            after_omniauth_create_account
+          else
+            set_redirect_error_flash omniauth_login_no_matching_account_error_flash
+            redirect omniauth_login_failure_redirect
+          end
         end
 
         if omniauth_identity
@@ -152,6 +159,10 @@ module Rodauth
       end
     end
 
+    def omniauth_create_account?
+      true
+    end
+
     def _omniauth_new_account(login)
       acc = { login_column => login }
       unless skip_status_checks?

data/locales/en.yml

@@ -2,3 +2,4 @@ en:
   rodauth:
     omniauth_failure_error_flash: There was an error logging in with the external provider
     omniauth_login_unverified_account_error_flash: The account matching the external identity is currently awaiting verification
+    omniauth_login_no_matching_account_error_flash: There is no existing account matching the external identity

data/rodauth-omniauth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rodauth-omniauth"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko@hey.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-omniauth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-02 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rodauth