Skip to content

Commit 41abe52

Browse files
committed
don't bother looking up the current pseudonym in a cache
Authlogic has already read it out of the database at this point, so the cache doesn't gain us anything. Change-Id: I4bd21ddf17dbbe0efe288a26a4281440e6e932ad Reviewed-on: https://gerrit.instructure.com/5972 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Cody Cutrer <cody@instructure.com>
1 parent 57c1a08 commit 41abe52

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

lib/authentication_methods.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,10 @@ def load_user
6767
end
6868

6969
if !@access_token
70-
@pseudonym_session = @domain_root_account.pseudonym_session_scope.find
71-
key = @pseudonym_session.send(:session_credentials)[1] rescue nil
72-
if key
73-
@current_pseudonym = Pseudonym.find_cached(['_pseudonym_lookup', key].cache_key) do
74-
@pseudonym_session && @pseudonym_session.record
75-
end
76-
elsif @policy_pseudonym_id
70+
if @policy_pseudonym_id
7771
@current_pseudonym = Pseudonym.find_by_id(@policy_pseudonym_id)
7872
else
73+
@pseudonym_session = @domain_root_account.pseudonym_session_scope.find
7974
@current_pseudonym = @pseudonym_session && @pseudonym_session.record
8075
end
8176
if params[:login_success] == '1' && !@current_pseudonym

0 commit comments

Comments
 (0)