lib/ditty/helpers/authentication.rb in ditty-0.7.2 vs lib/ditty/helpers/authentication.rb in ditty-0.8.0

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
 require 'ditty/models/user'
-require 'ditty/models/role'
-require 'ditty/models/identity'
 
 module Ditty
   module Helpers
     module Authentication
       def current_user
         return nil if current_user_id.nil?
+
         @current_user ||= User[current_user_id]
       end
 
       def current_user=(user)
         env['rack.session'] = {} if env['rack.session'].nil?
         env['rack.session']['user_id'] = user.id if user
         @current_user = user
       end
 
       def current_user_id
-        return env['rack.session']['user_id'] if env['rack.session']
-        env['omniauth.auth'].uid if env['omniauth.auth']
+        return env['rack.session']['user_id'] if env['rack.session'] && env['rack.session']['user_id']
+
+        env['omniauth.auth']&.uid
       end
 
       def authenticate
         authenticated?
       end
@@ -31,14 +31,15 @@
         current_user && !current_user.role?('anonymous')
       end
 
       def authenticate!
         raise NotAuthenticated unless authenticated?
+
         true
       end
 
       def logout
-        env['rack.session'].delete('user_id') unless env['rack.session'].nil?
+        env['rack.session']&.delete('user_id')
         env.delete('omniauth.auth')
       end
     end
 
     class NotAuthenticated < StandardError