]> cat aescling's git repositories - mastodon.git/commitdiff
Catch :warden correctly
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 3 Oct 2016 17:19:03 +0000 (19:19 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 3 Oct 2016 17:19:03 +0000 (19:19 +0200)
app/channels/application_cable/connection.rb

index bdbf528bec3bdf7c203bcb11f36b5fef307892ae..b94063b105a9809efa96022ff58ecf26c68a8bcf 100644 (file)
@@ -9,14 +9,11 @@ module ApplicationCable
     protected
 
     def find_verified_user
-      verified_user = env['warden'].user
-
-      if verified_user
-        verified_user
-      else
-        reject_unauthorized_connection
+      catch :warden do
+        verified_user = env['warden'].user
+        return verified_user if verified_user
       end
-    rescue :warden
+
       reject_unauthorized_connection
     end
   end