thecore_auth_commons 3.5.2 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a083c2300c45d950b99efa4ff7e8a5642c11212acd01d392bb07f63fb38a19
-  data.tar.gz: 9a20546917d55959cf5aa5d4c272c43e7f09efc5888d80d05d9edbb634b499f8
+  metadata.gz: 7325e9f014b30e25244254412dffa1628d83db89c627059c6c253a6e24c94fc0
+  data.tar.gz: 9bb9f596f65baff791158e1a95eef62632eb2f8414720a42917beb493e82c0da
 SHA512:
-  metadata.gz: dbf9f9bcc726736caf0b785807609235d98b56f2180e9b9bd1af32b1167333c739ab27d6992a038b33d8a859612ce09bb6474f9f9851c5f4f0aa6bb74ebb702b
-  data.tar.gz: edf61e953a0cc68f0d9bde2866499e609241519f9511397cb6730e6549d560cfebbdb2a395ec0f61020c8ca0e8a2089b0c7f4dfe6e59e4dec92629ade6066b67
+  metadata.gz: f42b1e563d495c42b65189f746922aabe361b2355d73c63ad07df47fe851e7364d2532dd46fc260fdfa4e5543b32571eb5f0b0d0f064635e87ad80edf5ceab5b
+  data.tar.gz: 948132adb3cae41b8f7eebfb2d9aff0414b8dd4c234a99015b1e9ca0961a8de9124c9f9231be7982f5ce7bc324f518db4d0c006006da5023411caeb181fda7d8

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,10 +1,10 @@
 # app/controllers/users/omniauth_callbacks_controller.rb
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def google_oauth2
+  def google
     callback 'Google', from_params, 'google'
   end
 
-  def entra_id
+  def microsoft
     callback 'Microsoft Entra ID', from_params, 'entra_id'
   end
 

data/app/models/user.rb

@@ -8,7 +8,10 @@ class User < ApplicationRecord
     :validatable,
     # Devise modules configurations:
     # Omniauthable allows the user to sign in with external providers
-    :omniauth_providers => [:google_oauth2, :entra_id],
+    :omniauth_providers => [
+      ThecoreAuthCommons.entra_id_vars? && 'microsoft',
+      ThecoreAuthCommons.google_oauth2_vars? && 'google'
+    ].select(&:itself).compact,
     # Validatable allows the user to validate their email and password
     :password_length => ENV.fetch('MIN_PASSWORD_LENGTH', 8).to_i..128,
     :timeout_in => ENV.fetch('SESSION_TIMEOUT_IN_MINUTES', 31).to_i.minutes

data/config/initializers/omniauth.rb

@@ -8,12 +8,10 @@ Rails.application.config.middleware.use OmniAuth::Builder do
       client_secret: ENV['ENTRA_CLIENT_SECRET'],
       tenant_id: ENV['ENTRA_TENANT_ID'], # Needed for Microsoft
       scope: 'openid profile email User.Read',
-      response_type: 'code'
-    },
-    {
-      label: "Microsoft"
+      response_type: 'code',
+      name: "microsoft"
     }
-  )
+  ) if ThecoreAuthCommons.entra_id_vars?
   provider(
     :google_oauth2, 
     ENV['GOOGLE_CLIENT_ID'], 
@@ -21,9 +19,10 @@ Rails.application.config.middleware.use OmniAuth::Builder do
     {
       scope: 'email,profile',
       prompt: 'select_account',
-      access_type: 'online'
+      access_type: 'online',
+      name: "google"
     }
-  )
+  ) if ThecoreAuthCommons.google_oauth2_vars?
 end
 
 OmniAuth.config.allowed_request_methods = [:get, :post]

data/config/locales/it.thecore_auth_commons.yml

@@ -53,6 +53,7 @@ it:
         third_party: Ente Terzo?
         password: Password
         password_confirmation: Conferma Password
+        auth_source: Autenticazione
       role:
         users: Utenti
         name: Ruolo

data/lib/thecore_auth_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreAuthCommons
-  VERSION = "3.5.2".freeze
+  VERSION = "3.5.5".freeze
 end

data/lib/thecore_auth_commons.rb

@@ -14,9 +14,20 @@ require "thecore/seed"
 
 module ThecoreAuthCommons
   def self.oauth_vars? 
-    (ENV['ENTRA_CLIENT_ID'].present? && ENV['ENTRA_CLIENT_SECRET'].present? && ENV['ENTRA_TENANT_ID'].present?) || (ENV['GOOGLE_CLIENT_ID'].present? && ENV['GOOGLE_CLIENT_SECRET'].present?)
+     entra_id_vars? || google_oauth2_vars?
   end
 
+  def self.entra_id_vars?
+    ENV['ENTRA_CLIENT_ID'].present? && ENV['ENTRA_CLIENT_SECRET'].present? && ENV['ENTRA_TENANT_ID'].present?
+  end
+
+  def self.google_oauth2_vars?
+    ENV['GOOGLE_CLIENT_ID'].present? && ENV['GOOGLE_CLIENT_SECRET'].present?
+  end
+
+  # Controlla se l'utente esiste, altrimenti lo crea con una password casuale
+  # e lo restituisce. Se l'utente esiste già, lo restituisce senza modificarlo.
+
   def self.check_user email, name, surname, provider
     u = User.find_or_initialize_by(email: email)
     u.name = name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_auth_commons
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.5
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Common Auth methods and models to be used in thecore components.
 test_files: []