From 23dbc973a0cf74806b9b7c26c57af10656d7d1ba Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 2 Jun 2018 16:53:02 +0300
Subject: [PATCH] fixed #369

---
 app/Listeners/Auth/Login.php  | 12 +++++++++++-
 resources/lang/en-GB/auth.php |  5 ++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/Listeners/Auth/Login.php b/app/Listeners/Auth/Login.php
index 852989886..2efd3e597 100644
--- a/app/Listeners/Auth/Login.php
+++ b/app/Listeners/Auth/Login.php
@@ -16,9 +16,19 @@ class Login
      */
     public function handle(ILogin $event)
     {
-        // Set company id
+        // Get first company
         $company = $event->user->companies()->first();
+        
+        // Logout if no company assigned
+        if (!$company) {
+            auth()->logout();
+            
+            flash(trans('auth.error.no_company'))->error();
+            
+            return redirect('auth/login');
+        }
 
+        // Set company id
         session(['company_id' => $company->id]);
 
         // Save user login time
diff --git a/resources/lang/en-GB/auth.php b/resources/lang/en-GB/auth.php
index 9d34bb4f8..70bb87394 100644
--- a/resources/lang/en-GB/auth.php
+++ b/resources/lang/en-GB/auth.php
@@ -13,14 +13,17 @@ return [
     'current_email'         => 'Current Email',
     'reset'                 => 'Reset',
     'never'                 => 'never',
+    
     'password' => [
         'current'           => 'Password',
         'current_confirm'   => 'Password Confirmation',
         'new'               => 'New Password',
         'new_confirm'       => 'New Password Confirmation',
     ],
+    
     'error' => [
-        'self_delete'       => 'Error: Can not delete yourself!'
+        'self_delete'       => 'Error: Can not delete yourself!',
+        'no_company'        => 'Error: No company assigned to your account. Please, contact the system administrator.',
     ],
 
     'failed'                => 'These credentials do not match our records.',