From dbbf116c5245ab5c5bff0f864fb898be4596d4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 16 May 2025 15:59:40 +0400 Subject: [PATCH] Fix RS storage-first auth work in dev, remove token See https://github.com/remotestorage/remotestorage.js/issues/900 --- app/controllers/services/rs_auths_controller.rb | 6 +++++- spec/controllers/services/rs_auths_controller_spec.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/services/rs_auths_controller.rb b/app/controllers/services/rs_auths_controller.rb index d688929..d47208d 100644 --- a/app/controllers/services/rs_auths_controller.rb +++ b/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 diff --git a/spec/controllers/services/rs_auths_controller_spec.rb b/spec/controllers/services/rs_auths_controller_spec.rb index 61dc088..1284f68 100644 --- a/spec/controllers/services/rs_auths_controller_spec.rb +++ b/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