model_driven_api 3.4.1 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 947535ba94bce4b6b7b3eaed83f5ffd9b624781de13151a8e876bbf490df057a
-  data.tar.gz: a0626e40d22e148fb4b1e15956a28ed90c0a1aca332a2bbb67a01b13726ad2d6
+  metadata.gz: 5dab5906eeb7f41358f97e9ca38233e52ad156c2220a18dbea567503a987f8f9
+  data.tar.gz: a37524b760679665f515969501d5672474fa17fc76dcb1f09ee8e852ae11e0e6
 SHA512:
-  metadata.gz: 7ead1586c1e81df0632b582f72e6e94ca39235f56ba3c2e1700db809514246120e23d2865a62de6bd48252d4d0d6f7e6fb1a57d76541a1c59b43153534ff2ab1
-  data.tar.gz: '0656608baf5a2ba86b4b3eff6a585274c6fbf53bfb6108be2479e681e8a726158cc066489c433482cc1d2eca7822b0d8d76cab7c99ad31f16d12754f564ae492'
+  metadata.gz: 0f8db3a7710aa33b4113541c74ca4d8b8907ccdedc97e38c34057333e8cf4f8dcf8d48a7fa6d650f73f20f5615025a4a03c03bae89bc4097fb313846be422ad6
+  data.tar.gz: 71cc223375df7a9e002a4c9bc68203ae971b43d9d95bef3fa6b9ecf4d594f4cbfa81a158e47f986395812e68ce24448ba93dd1b2b6189fe1f1309ad139ac53fa

data/app/controllers/api/v2/auth/oauth_controller.rb

@@ -1,15 +1,8 @@
 module Api::V2::Auth
   class OauthController < ActionController::API
     def callback
-      email = params['email']
+      user = ThecoreAuthCommons.check_user params['email'], params['given_name'], params['family_name'], params['provider']
 
-      user = User.find_or_create_by(email: email) do |u|
-        u.name = params['given_name']
-        u.surname = params['family_name']
-        u.password = u.password_confirmation = ThecoreAuthCommons.generate_secure_password
-        u.auth_source = params['provider'] # 'google' or 'microsoft'
-        u.admin = true
-      end
       unless user
         render json: { error: "User not registered" }, status: :unauthorized
         return

data/config/routes.rb

@@ -1,9 +1,8 @@
 # require 'ransack'
 
 Rails.application.routes.draw do
-    oauth_test = (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?)
     scope ENV.fetch("RAILS_RELATIVE_URL_ROOT", "/") do
-        if oauth_test
+        if ThecoreAuthCommons.oauth_vars?
             # OmniAuth callbacks need these top-level paths:
             match '/auth/:provider/callback', to: redirect('/api/v2/auth/%{provider}/callback'), via: [:get, :post]
             match '/auth/failure', to: redirect('/api/v2/auth/failure'), via: [:get, :post]
@@ -11,7 +10,7 @@ Rails.application.routes.draw do
         namespace :api, constraints: { format: :json } do
             namespace :v2 do
                 # Authentication via Oauth2 only if the environment variable is set
-                if oauth_test
+                if ThecoreAuthCommons.oauth_vars?
                     namespace :auth do
                         # Omniauth routes for OAuth2 authentication
                         match ':provider/callback', to: 'oauth#callback', via: [:get, :post]

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.4.1".freeze
+  VERSION = "3.4.3".freeze
 end

data/lib/model_driven_api.rb

@@ -13,10 +13,6 @@ require 'concerns/api_exception_management'
 
 require 'deep_merge/rails_compat'
 
-require 'omniauth'
-require 'omniauth-google-oauth2'
-require 'omniauth-entra-id'
-
 require "model_driven_api/engine"
 
 require "safe_sql_executor"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.3
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -93,48 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: omniauth-google-oauth2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: omniauth-entra-id
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +132,6 @@ files:
 - config/initializers/after_initialize_for_model_driven_api.rb
 - config/initializers/cors_api_thecore.rb
 - config/initializers/knock.rb
-- config/initializers/omniauth.rb
 - config/initializers/time_with_zone.rb
 - config/initializers/wrap_parameters.rb
 - config/routes.rb

data/config/initializers/omniauth.rb

@@ -1,20 +0,0 @@
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider(
-    :entra_id,
-    {
-      client_id: ENV['ENTRA_CLIENT_ID'],
-      client_secret: ENV['ENTRA_CLIENT_SECRET'],
-      tenant_id: ENV['ENTRA_TENANT_ID'], # Needed for Microsoft
-      scope: 'User.Read',
-      response_type: 'code'
-    }
-  )
-  provider :google_oauth2, ENV['GOOGLE_CLIENT_ID'], ENV['GOOGLE_CLIENT_SECRET'], {
-    scope: 'email,profile',
-    prompt: 'select_account',
-    access_type: 'online'
-  }
-end
-
-OmniAuth.config.allowed_request_methods = [:get, :post]
-OmniAuth.config.silence_get_warning = true