rhino_project_core 0.30.0.alpha.13 → 0.30.0.alpha.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f50327ef636c37b845d5f8f2feeb58dfb2e53c86245e8f8f730dff87c9fab8
-  data.tar.gz: 2ee355cca95557979d484733a19117d11431772a1c89a9db6c76d5b164eb9ef2
+  metadata.gz: 7c3c0715e3664edd24fa42e711c47db0955a19422a2e984566494d8602810a5f
+  data.tar.gz: f1ba9388ec978e26361b13355172b641e049e4f5331f1d5e87a5c61746dafe34
 SHA512:
-  metadata.gz: af624adac026cfa723d19489c9bca5af76927b44e02d0f308a2a0a7917a581e3509564a98f8ca34d783a46e9d2701753bce053e674ba902f2b97c6ef27176c99
-  data.tar.gz: 2e82c35378c75899ac9b36d9212d3934bb4f15aa9f3624463b80a88c19f7af81b599cf7d92429ca870f91031f4270c42b222d43cea5f1cc7ba8b84c841b8c289
+  metadata.gz: 30977d8aeb0c1489349db37ffff6130a5ab65fb3ddcb45a70f16611543b354de48a46d2d1e6e7e04ac1af32313a8ee0ab1db03afee87f435b0c11d09a3356a14
+  data.tar.gz: 32e57851051dd1f5729f79c45852552b9dd10e54807abbd4dbb35ea208d4a1f31dc303e41d6855d95b5485a0de751276ee1fd7fc6d0737dd27335c9f9047803b

data/app/helpers/rhino/omniauth_helper.rb

@@ -5,12 +5,10 @@ module Rhino
     module_function
 
     def strategies_metadata
-      params = { resource_class: "User" }
-
       strategies.each_with_object([]) do |strategy, array|
         array << {
           name: strategy,
-          path: "#{::OmniAuth.config.path_prefix}/#{strategy}?#{params.to_param}"
+          path: "#{::OmniAuth.config.path_prefix}/#{strategy}"
         }
       end
     end
@@ -23,8 +21,6 @@ module Rhino
         match[1].downcase.to_sym
       end.uniq
 
-      strategies += [:developer] if Rails.env.development? && !Rake.try(:application)
-
       strategies
     end
 

data/app/models/rhino/user.rb

@@ -25,6 +25,10 @@ module Rhino
       name || email
     end
 
+    def token_validation_response
+      to_caching_json
+    end
+
     def self.roles_for_auth(auth_owner, record = nil)
       return {} unless auth_owner
 

data/app/overrides/devise_token_auth/confirmations_controller_override.rb

@@ -5,7 +5,7 @@ module DeviseTokenAuth::ConfirmationsController::Extensions
   def show
     super
   rescue StandardError
-    redirect_to ENV["FRONT_END_URL"]
+    redirect_to ENV["ROOT_URL"]
   end
 end
 

data/app/overrides/devise_token_auth/passwords_controller_override.rb

@@ -4,6 +4,6 @@ class DeviseTokenAuth::PasswordsController
   # If there is an error preparing to edit the password, redirect to frontend
   # This would normally be an expired password token
   def render_edit_error
-    redirect_to "#{ENV['FRONT_END_URL']}/auth/reset-password/expired"
+    redirect_to "#{ENV['ROOT_URL']}/auth/reset-password/expired"
   end
 end

data/app/overrides/devise_token_auth/registrations_controller_override.rb

@@ -13,6 +13,14 @@ module DeviseTokenAuth::RegistrationsController::Extensions
       create_organization(resource) if Rhino.resources.include?("Organization")
     end
   end
+
+  # Get all the information just like the token_validation_response and sign_in
+  def render_create_success
+    render json: {
+      success: true,
+      data: resource_data(resource_json: @resource.token_validation_response)
+    }
+  end
 end
 
 class DeviseTokenAuth::RegistrationsController

data/lib/generators/rhino/dev/setup/templates/env.tt

@@ -2,7 +2,6 @@ PORT=<%= server_port %>
 
 # Server
 ROOT_URL=http://localhost:$PORT
-FRONT_END_URL=http://localhost:$PORT
 
 DB_NAME=<%= db_name %>
 DB_HOST=<%= db_host %>
@@ -10,9 +9,6 @@ DB_PORT=<%= db_port %>
 DB_USERNAME=<%= db_user %>
 DB_PASSWORD=<%= db_password %>
 
-# Client
-VITE_API_ROOT_PATH=$ROOT_URL
-
 # Production server:
 SENDGRID_API_KEY=<api-key>
 

data/lib/generators/rhino/module/templates/test/dummy/config/initializers/devise_token_auth.rb

@@ -66,6 +66,6 @@ DeviseTokenAuth.setup do |config|
   # send email, set it to true. (This is a setting for compatibility)
   # config.send_confirmation_email = true
 
-  config.default_confirm_success_url = "#{ENV['FRONT_END_URL']}/auth/signin"
-  config.default_password_reset_url = "#{ENV['FRONT_END_URL']}/auth/reset-password"
+  config.default_confirm_success_url = "#{ENV['ROOT_URL']}/auth/signin"
+  config.default_password_reset_url = "#{ENV['ROOT_URL']}/auth/reset-password"
 end

data/lib/rhino/resource/active_record_extension/params.rb

@@ -89,7 +89,12 @@ module Rhino
                 # An array of references
                 if desc[:type] == :array && (desc[:items].key?(:$ref) || desc[:items].key?(:anyOf))
                   # FIXME: Hack for has_many_attached
-                  next params << { prop => [] } if desc.dig(:items, :anyOf)[0]&.dig(:$ref) == "#/components/schemas/active_storage_attachment"
+                  if desc.dig(:items, :anyOf)[0]&.dig(:$ref) == "#/components/schemas/active_storage_attachment"
+                    params << { prop => [] }
+                    params << { prop => ["signed_id"] }
+
+                    next
+                  end
 
                   # We only accept if the active record accepts it
                   next unless nested_attributes_options.key?(prop_sym) || desc.dig(:items, :anyOf)[0]&.dig(:$ref)
@@ -138,7 +143,8 @@ module Rhino
 
                     { prop => assoc_params.flatten.uniq }
                   else
-                    { prop => klasses.map(&:identifier_property).uniq }
+                    # For ActiveStorage::Attachment we want to accept the signed_id
+                    { prop => klasses.map { it == ActiveStorage::Attachment ? "signed_id" : it.identifier_property }.uniq }
                   end
                 end
 
@@ -162,12 +168,25 @@ module Rhino
                 # FIXME
                 # Hack to rewrite for attachment/attachments and guard against object resubmission
                 if param_key.end_with?("_attachment")
-                  hash[param_key.remove("_attachment")] = param_value if param_value.is_a?(String) || param_value.nil?
+                  # If its a string, its the signed_id
+                  hash[param_key.remove("_attachment")] = if param_value.is_a?(String) || param_value.nil?
+                    param_value
+
+                  # Otherwise if its a hash, and we want the signed_id from it
+                  elsif param_value.is_a?(ActionController::Parameters)
+                    param_value["signed_id"]
+                  end
 
                   next
                 end
                 if param_key.end_with?("_attachments")
-                  hash[param_key.remove("_attachments")] = param_value if param_value.is_a?(Array) || param_value.nil?
+                  hash[param_key.remove("_attachments")] = if param_value.nil?
+                    param_value
+
+                  # if an element is a string, its the signed_id, if its a hash, we want the signed_id from it
+                  elsif param_value.is_a?(Array)
+                    param_value.map { it.is_a?(ActionController::Parameters) ? it["signed_id"] : it }
+                  end
 
                   next
                 end

data/lib/rhino/sieve/order.rb

@@ -13,7 +13,7 @@ module Rhino
         @param = params[:order]
 
         # Always append id to the end of the order clause to ensure a stable sort for pagination
-        result = apply_order.order(scope.primary_key)
+        result = apply_order.order(scope.primary_key.to_sym)
         @app.resolve(result, params)
       end
 

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 30
     TINY  = 0
-    PRE   = "alpha.13"
+    PRE   = "alpha.15"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.alpha.13
+  version: 0.30.0.alpha.15
 platform: ruby
 authors:
 - JP Rosevear
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-26 00:00:00.000000000 Z
+date: 2025-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +49,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: analytics-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +91,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +133,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -511,7 +510,6 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -526,8 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ''
 test_files: []