From 96191ff1f10c12eb98d6501c817c3334f4c5b04f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 5 Aug 2022 17:27:17 +1000
Subject: [PATCH 1/3] Fixes for company token generation

---
 app/Repositories/UserRepository.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 2091be991955..0f1558945e6a 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -15,6 +15,7 @@ use App\DataMapper\CompanySettings;
 use App\Events\User\UserWasArchived;
 use App\Events\User\UserWasDeleted;
 use App\Events\User\UserWasRestored;
+use App\Jobs\Company\CreateCompanyToken;
 use App\Models\CompanyUser;
 use App\Models\User;
 use App\Utils\Ninja;
@@ -56,10 +57,11 @@ class UserRepository extends BaseRepository
         $account = $company->account;
 
         /* If hosted and Enterprise we need to increment the num_users field on the accounts table*/
-        if (! $user->id && $account->isEnterpriseClient()) {
-            $account->num_users++;
-            $account->save();
-        }
+        // 05-08-2022 This is an error, the num_users should _never_ increment
+        // if (! $user->id && $account->isEnterpriseClient()) {
+        //     $account->num_users++;
+        //     $account->save();
+        // }
 
         $user->fill($details);
 
@@ -94,6 +96,11 @@ class UserRepository extends BaseRepository
                     $cu->restore();
                     $cu->tokens()->restore();
                     $cu->save();
+
+                    if($cu->tokens()->count() == 0){
+                        (new CreateCompanyToken($cu->company, $cu->user, 'restored_user'))->handle();
+                    }
+
                 } else {
                     $cu->notifications = $data['company_user']['notifications'];
                     $cu->settings = $data['company_user']['settings'];

From 5cd83076864dbc82f5c9fc1a640a8ddc8e94f1b9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 5 Aug 2022 17:42:54 +1000
Subject: [PATCH 2/3] Fixes for users

---
 app/Repositories/UserRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 0f1558945e6a..abc9da0957b3 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -97,6 +97,7 @@ class UserRepository extends BaseRepository
                     $cu->tokens()->restore();
                     $cu->save();
 
+                    //05-08-2022
                     if($cu->tokens()->count() == 0){
                         (new CreateCompanyToken($cu->company, $cu->user, 'restored_user'))->handle();
                     }

From 87eccc15639825bb3c279ec3f2e228cfb81b093b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 5 Aug 2022 17:49:38 +1000
Subject: [PATCH 3/3] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 807279c6ceeb..460032ba1b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /public/storage
 /public/react
 /storage/*.key
+/storage/debugbar
 /vendor
 /.idea
 /.vscode