about summary refs log tree commit diff
path: root/app/controllers/well_known
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-12-06 07:04:49 +0100
committerYamagishi Kazutoshi <ykzts@desire.sh>2017-12-06 15:04:49 +0900
commit42bcbd36b72c7ddc5ae1ecced09614863ca382bd (patch)
tree851a64a7930cccdcda924bc12f0493e3fb22ecf1 /app/controllers/well_known
parent0393a64a90c2dee17e7a9d0c1481fd4155825b85 (diff)
Remove rabl dependency (#5894)
* Remove rabl dependency

* Replicate old Oj configuration
Diffstat (limited to 'app/controllers/well_known')
-rw-r--r--app/controllers/well_known/webfinger_controller.rb19
1 files changed, 1 insertions, 18 deletions
diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb
index 1c27b2b18..5cc606808 100644
--- a/app/controllers/well_known/webfinger_controller.rb
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -6,12 +6,10 @@ module WellKnown
 
     def show
       @account = Account.find_local!(username_from_resource)
-      @canonical_account_uri = @account.to_webfinger_s
-      @magic_key = pem_to_magic_key(@account.keypair.public_key)
 
       respond_to do |format|
         format.any(:json, :html) do
-          render formats: :json, content_type: 'application/jrd+json'
+          render json: @account, serializer: WebfingerSerializer, content_type: 'application/jrd+json'
         end
 
         format.xml do
@@ -35,21 +33,6 @@ module WellKnown
       WebfingerResource.new(resource_user).username
     end
 
-    def pem_to_magic_key(public_key)
-      modulus, exponent = [public_key.n, public_key.e].map do |component|
-        result = []
-
-        until component.zero?
-          result << [component % 256].pack('C')
-          component >>= 8
-        end
-
-        result.reverse.join
-      end
-
-      (['RSA'] + [modulus, exponent].map { |n| Base64.urlsafe_encode64(n) }).join('.')
-    end
-
     def resource_param
       params.require(:resource)
     end