From 1a5c66bf20c3f0c4fdd53ee1821672cf10b2fb8a Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Sun, 19 Apr 2020 19:48:58 +1000
Subject: [PATCH] Support custom user fields in profile update action

---
 lib/custom_wizard/action.rb | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb
index dfb02da7..556b91bf 100644
--- a/lib/custom_wizard/action.rb
+++ b/lib/custom_wizard/action.rb
@@ -102,10 +102,16 @@ class CustomWizard::Action
     params = {}
     
     profile_updates.first[:pairs].each do |pair|
-      if allowed_profile_fields.include?(pair['key'])
-        key = cast_profile_key(pair['key']).to_sym
-        value = mapper.map_field(pair['value'], pair['value_type'])     
-        params[key] = cast_profile_value(value, pair['key'])
+      if allowed_profile_field?(pair['key'])
+        key = cast_profile_key(pair['key'])
+        value = cast_profile_value(mapper.map_field(pair['value'], pair['value_type']), pair['key']) 
+        
+        if user_field?(pair['key'])
+          params[:custom_fields] ||= {}
+          params[:custom_fields][key] = value
+        else
+          params[key.to_sym] = value
+        end
       end
     end
     
@@ -330,6 +336,15 @@ class CustomWizard::Action
     ['username', 'email', 'trust_level'].freeze
   end
   
+  def allowed_profile_field?(field)
+    allowed_profile_fields.include?(field) || user_field?(field)
+  end
+  
+  def user_field?(field)
+    field.to_s.include?(::User::USER_FIELD_PREFIX) &&
+    ::UserField.exists?(field.split('_').last.to_i) 
+  end
+  
   def allowed_profile_fields
     CustomWizard::Mapper.user_fields.select { |f| profile_excluded_fields.exclude?(f) } + 
     profile_url_fields +