Skip to content

Commit 7e4550a

Browse files
Hamdan85MaicolBen
authored andcommitted
sign in multiple resources (#1248)
1 parent fb7a24a commit 7e4550a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

app/controllers/devise_token_auth/concerns/set_user_by_token.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ def set_user_by_token(mapping = nil)
6969

7070
# mitigate timing attacks by finding by uid instead of auth token
7171
user = uid && rc.dta_find_by(uid: uid)
72+
scope = rc.to_s.underscore.to_sym
7273

7374
if user && user.valid_token?(@token, @client_id)
7475
# sign_in with bypass: true will be deprecated in the next version of Devise
7576
if respond_to?(:bypass_sign_in) && DeviseTokenAuth.bypass_sign_in
76-
bypass_sign_in(user, scope: :user)
77+
bypass_sign_in(user, scope: scope)
7778
else
78-
sign_in(:user, user, store: false, event: :fetch, bypass: DeviseTokenAuth.bypass_sign_in)
79+
sign_in(scope, user, store: false, event: :fetch, bypass: DeviseTokenAuth.bypass_sign_in)
7980
end
8081
return @resource = user
8182
else

0 commit comments

Comments
 (0)