thecore_backend_commons 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49cad14dab24e49c18b425a25ba02bf80183ac74626cf3ef7858bfb71b969f6
-  data.tar.gz: 923b24b8fcaf1b5dd36f5afdea8ec045074be9d9ca397b89b076cb1768c14a93
+  metadata.gz: f4cf64bb68e9bcccd605b40aa32460cbb7ced88874a6ffad06d17e8cc8146c71
+  data.tar.gz: 345dca267915d4fadbc63693309cfc8e143664cab7c6c4fa362bbf97aa9466d8
 SHA512:
-  metadata.gz: f8a94044a00da96909a6003d672eb2945dc25792640002684581d305f02c1b1a1c8afede032b9340a73f0687b53a076bbfe4cdfc9b8f99361a078010df39db28
-  data.tar.gz: 88ff40875bde193b3b88c226f56e922f40a2251ed8403864e0b5203f564e5d4bffe087a258aef8494a91479face853b2a6e951c8a35d884f349f9d34106e3dbd
+  metadata.gz: ac72482edd4c3e30c42429616411bf6851136ef970bda078a2026eacdbf1e07a31146d8235da56298988db2b83da69074f03efc3fee506afe4b5ebf55e95e6e6
+  data.tar.gz: '0181dd13da02d410a4508c93ecf0a93a8f183fd39676aff557dadc889dc19fc3b5a5296f97e46becc59497335bc4f7eedd0be84d062ddadb1d63a7016313a4c7'

data/config/initializers/application_config.rb

@@ -1,3 +1,6 @@
+Rails.application.config.relative_url_root = ENV.fetch("RAILS_RELATIVE_URL_ROOT", "/")
+Rails.application.config.assets.prefix = "#{ENV.fetch("RAILS_RELATIVE_URL_ROOT", "")}/assets".gsub('//', '/')
+
 Rails.application.config.active_storage.configure :Disk, root: Rails.root.join("storage")
 Rails.application.config.action_mailer.delivery_method = :smtp
-Rails.application.config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/, /file:\/\/*/, 'file://', nil]
+Rails.application.config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/, /file:\/\/*/, 'file://', nil]

data/config/initializers/concern_cable_connection.rb

@@ -16,12 +16,17 @@ module CableConnectionConcern
       # It looks for a token in the query parameters, or in the headers
       m = request.query_parameters["token"].presence || request.headers["Authorization"].split(" ").second.strip rescue nil
 
-      body = ::HashWithIndifferentAccess.new(::JWT.decode(m, ::Rails.application.credentials.dig(:secret_key_base).presence||ENV["SECRET_KEY_BASE"], false)[0]) rescue nil
-      if verified_user = (env['warden'].user.presence || User.find_by(id: body[:user_id]) rescue false)
-        verified_user
-      else
-        reject_unauthorized_connection
-      end
+      # check for m2m token
+      user = User.where.not(encrypted_access_token: nil).find { |u| BCrypt::Password.new(u.encrypted_access_token) == m } rescue false
+      return user if user
+
+      # check for JWT token
+      body = (::HashWithIndifferentAccess.new(::JWT.decode(m, ::Rails.application.credentials.dig(:secret_key_base).presence||ENV["SECRET_KEY_BASE"], false)[0]) rescue nil)
+      verified_user = env['warden'].user.presence || User.find_by(id: body[:user_id]) rescue false
+      return verified_user if verified_user
+
+      # The Token is not m2m nor JWT, fail
+      return reject_unauthorized_connection
     end
   end
 end

data/lib/thecore_backend_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreBackendCommons
-  VERSION = "3.2.3"
+  VERSION = "3.2.5"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: thecore_backend_commons
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - Gabriele Tassoni
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_auth_commons
@@ -201,7 +200,6 @@ metadata:
   homepage_uri: https://github.com/gabrieletassoni/thecore_backend_commons
   source_code_uri: https://github.com/gabrieletassoni/thecore_backend_commons
   changelog_uri: https://github.com/gabrieletassoni/thecore_backend_commons/blob/master/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Thecore 3 foundations for the Web UI Backend.
 test_files: []