Merge branch 'master' into live

See https://github.com/remotestorage/remotestorage.js/issues/900

app/controllers/services/rs_auths_controller.rb

@@ -23,7 +23,11 @@ class Services::RsAuthsController < Services::BaseController
   end
 
   def launch_app
-    launch_url = "#{@auth.launch_url}#remotestorage=#{current_user.address}&access_token=#{@auth.token}"
+    user_address = Rails.env.development? ?
+      "#{current_user.cn}@localhost:3000" :
+      current_user.address
+
+    launch_url = "#{@auth.launch_url}#remotestorage=#{user_address}"
 
     redirect_to launch_url, allow_other_host: true
   end

spec/controllers/services/rs_auths_controller_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Services::RsAuthsController, type: :controller do
         end
 
         it "redirects to the given URL with the correct RS URL fragment params" do
-          launch_url = "https://app.example.com#remotestorage=#{user.address}&access_token=#{@auth.token}"
+          launch_url = "https://app.example.com#remotestorage=#{user.address}"
           expect(response).to redirect_to(launch_url)
         end
       end