From 7b3e6ad0c7c8ab14cdef169c94d8c8d252129f72 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 1 Aug 2015 01:20:02 +0200
Subject: [PATCH] remove quotes from alias-url from old webfinger xml

---
 lib/diaspora_federation/discovery/web_finger.rb           | 8 +++++++-
 spec/lib/diaspora_federation/discovery/web_finger_spec.rb | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/diaspora_federation/discovery/web_finger.rb b/lib/diaspora_federation/discovery/web_finger.rb
index d8759a8..75e7f1c 100644
--- a/lib/diaspora_federation/discovery/web_finger.rb
+++ b/lib/diaspora_federation/discovery/web_finger.rb
@@ -154,7 +154,7 @@ module DiasporaFederation
 
         new(
           acct_uri:    data[:subject],
-          alias_url:   data[:aliases].first,
+          alias_url:   clean_alias(data[:aliases].first),
           hcard_url:   parse_link(links, REL_HCARD),
           seed_url:    parse_link(links, REL_SEED),
           profile_url: parse_link(links, REL_PROFILE),
@@ -217,6 +217,12 @@ module DiasporaFederation
         element ? element[:href] : nil
       end
       private_class_method :parse_link
+
+      # @deprecated remove this, when all pods use this gem for generation
+      def self.clean_alias(alias_string)
+        alias_string.gsub(/\A"|"\Z/, "")
+      end
+      private_class_method :parse_link
     end
   end
 end
diff --git a/spec/lib/diaspora_federation/discovery/web_finger_spec.rb b/spec/lib/diaspora_federation/discovery/web_finger_spec.rb
index 79d3e4f..5ce2722 100644
--- a/spec/lib/diaspora_federation/discovery/web_finger_spec.rb
+++ b/spec/lib/diaspora_federation/discovery/web_finger_spec.rb
@@ -70,7 +70,7 @@ XML
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
   <Subject>#{acct}</Subject>
-  <Alias>#{person.alias_url}</Alias>
+  <Alias>"#{person.alias_url}"</Alias>
   <Link rel="http://microformats.org/profile/hcard" type="text/html" href="#{person.hcard_url}"/>
   <Link rel="http://joindiaspora.com/seed_location" type = "text/html" href="#{person.url}"/>
   <Link rel="http://joindiaspora.com/guid" type = "text/html" href="#{person.guid}"/>