app/controllers/application_controller.rb

@@ -37,8 +37,4 @@ class ApplicationController < ActionController::Base
       format.any  { head status }
     end
   end
-
-  def after_sign_in_path_for(user)
-    session[:user_return_to] || root_path
-  end
 end

app/controllers/rs/oauth_controller.rb

@@ -108,7 +108,6 @@ class Rs::OauthController < ApplicationController
   def require_signed_in_with_username
     unless user_signed_in?
       username, org = params[:useraddress].split("@")
-      session[:user_return_to] = request.url
       redirect_to new_user_session_path(cn: username, ou: org)
     end
   end

spec/features/rs/oauth_spec.rb

@@ -54,11 +54,6 @@ RSpec.describe 'remoteStorage OAuth Dialog', type: :feature do
   context "when signed out" do
     let(:user) { create :user }
 
-    before do
-      allow_any_instance_of(User).to receive(:valid_ldap_authentication?)
-        .with(user.password).and_return(true)
-    end
-
     it "prefills the username field in the signin form" do
       visit new_rs_oauth_path(useraddress: user.address,
                               redirect_uri: "http://example.com",
@@ -67,19 +62,5 @@ RSpec.describe 'remoteStorage OAuth Dialog', type: :feature do
 
       expect(find("#user_cn").value).to eq(user.cn)
     end
-
-    it "redirects to the OAuth dialog after sign-in" do
-      auth_url = new_rs_oauth_url(useraddress: user.address,
-                                   redirect_uri: "http://example.com",
-                                   client_id: "http://example.com",
-                                   scope: "documents,[photos], contacts:r")
-      visit auth_url
-
-      fill_in "User", with: user.cn
-      fill_in "Password", with: user.password
-      click_button "Log in"
-
-      expect(current_url).to eq(auth_url)
-    end
   end
 end