fix token auth

stgm · Dec 19, 2020 · e9d0b5a · e9d0b5a
1 parent 91e5601
commit e9d0b5a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/helpers/authentication_helper.rb b/app/helpers/authentication_helper.rb
@@ -15,7 +15,11 @@ def current_user
 	private
 
 	def load_current_user
-		if authenticated? && login = Login.where(login: (request.session['cas']['user']).downcase).first
+		if request.session['token'].present?
+			if user = User.where(token: request.session['token']).first
+				@current_user = user
+			end
+		elsif request.session['cas'].present? && login = Login.where(login: (request.session['cas']['user']).downcase).first
 			@current_user = login.user
 		else
 			# use an empty user object in case of no login