From cae933510cbc64db27aeb44e205ce17ff4974da7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 2 May 2018 15:57:37 +0200
Subject: [PATCH] Allow updating bio fields via PUT
 /api/v1/accounts/update_credentials (#7288)

Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials
---
 app/controllers/api/v1/accounts/credentials_controller.rb | 2 +-
 app/models/account.rb                                     | 4 ++++
 app/serializers/rest/credential_account_serializer.rb     | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 062d490a731..a3c4008e649 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
   private
 
   def account_params
-    params.permit(:display_name, :note, :avatar, :header, :locked)
+    params.permit(:display_name, :note, :avatar, :header, :locked, fields_attributes: [:name, :value])
   end
 
   def user_settings_params
diff --git a/app/models/account.rb b/app/models/account.rb
index 0cd2a10d5b0..a166fb4746f 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -273,6 +273,10 @@ class Account < ApplicationRecord
       @value   = attr['value']
       @errors  = {}
     end
+
+    def to_h
+      { name: @name, value: @value }
+    end
   end
 
   class << self
diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb
index 870d8b71f02..56857cba885 100644
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@@ -5,10 +5,12 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
 
   def source
     user = object.user
+
     {
       privacy: user.setting_default_privacy,
       sensitive: user.setting_default_sensitive,
       note: object.note,
+      fields: object.fields.map(&:to_h),
     }
   end
 end