1 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/controller_extension/authentication.rb b/app/controllers/controller_extension/authentication.rb
index 03d3989..2bc0aee 100644
--- a/app/controllers/controller_extension/authentication.rb
+++ b/app/controllers/controller_extension/authentication.rb
@@ -8,11 +8,11 @@ module ControllerExtension::Authentication
   end
 
   def current_user
-    @current_user ||= token_authenticate || warden.user
+    @current_user ||= token_authenticate || warden.user || unauthenticated
   end
 
   def logged_in?
-    !!current_user
+    current_user.is_a? User
   end
 
   def require_login
@@ -42,7 +42,7 @@ module ControllerExtension::Authentication
   end
 
   def admin?
-    current_user && current_user.is_admin?
+    current_user.is_admin?
   end
 
   def require_admin
@@ -72,4 +72,10 @@ module ControllerExtension::Authentication
     request.env['warden.options'] &&
       request.env['warden.options'][:attempted_path]
   end
+
+  protected
+
+  def unauthenticated
+    UnauthenticatedUser.new
+  end
 end