From 1f87ca6ca24a0342423f07ceed7584d053d9a5df Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 25 Apr 2021 21:04:48 +1000
Subject: [PATCH 1/2] Delete migration directory after Import

---
 app/Http/Kernel.php                      |  2 --
 app/Http/Middleware/SetDefaultMailer.php | 35 ------------------------
 app/Jobs/Util/StartMigration.php         |  3 ++
 routes/api.php                           |  4 +--
 4 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 app/Http/Middleware/SetDefaultMailer.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index fe9ea8505b5a..63803aa46499 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,7 +29,6 @@ use App\Http\Middleware\QueryLogging;
 use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Middleware\SetDb;
 use App\Http\Middleware\SetDbByCompanyKey;
-use App\Http\Middleware\SetDefaultMailer;
 use App\Http\Middleware\SetDomainNameDb;
 use App\Http\Middleware\SetEmailDb;
 use App\Http\Middleware\SetInviteDb;
@@ -160,6 +159,5 @@ class Kernel extends HttpKernel
         'contact_key_login' => ContactKeyLogin::class,
         'check_client_existence' => CheckClientExistence::class,
         'user_verified' => UserVerified::class,
-        'default_mailer' => SetDefaultMailer::class,
     ];
 }
diff --git a/app/Http/Middleware/SetDefaultMailer.php b/app/Http/Middleware/SetDefaultMailer.php
deleted file mode 100644
index dec0e382ade9..000000000000
--- a/app/Http/Middleware/SetDefaultMailer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://opensource.org/licenses/AAL
- */
-
-namespace App\Http\Middleware;
-
-use App\Libraries\MultiDB;
-use Closure;
-use Illuminate\Http\Request;
-use stdClass;
-
-class SetDefaultMailer
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  Request  $request
-     * @param Closure $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-
-        config(['mail.default' => config('mail.default')]);
-
-        return $next($request);
-    }
-}
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index 337a57f1e661..e26c7462ed74 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -26,6 +26,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
 use ZipArchive;
 
 class StartMigration implements ShouldQueue
@@ -110,6 +111,8 @@ class StartMigration implements ShouldQueue
 
             Import::dispatchNow($file, $this->company, $this->user);
 
+            Storage::deleteDirectory(public_path("storage/migrations/{$filename}"));
+
         } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) {
 
             Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage()));
diff --git a/routes/api.php b/routes/api.php
index 3363c54ffc3a..1dd0e044e87b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,12 +13,12 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => ['api_secret_check', 'default_mailer']], function () {
+Route::group(['middleware' => ['api_secret_check']], function () {
     Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
     Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
 });
 
-Route::group(['middleware' => ['api_secret_check', 'email_db', 'default_mailer']], function () {
+Route::group(['middleware' => ['api_secret_check', 'email_db']], function () {
     Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
     Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
 });

From 75e833aab30834cf397aaceb2cc46b9752dd46aa Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 26 Apr 2021 13:01:59 +1000
Subject: [PATCH 2/2] Fixes for listeners:

---
 .../Account/CreateAccountActivity.php         | 53 +++++++++++++++++++
 app/Providers/EventServiceProvider.php        |  3 ++
 2 files changed, 56 insertions(+)
 create mode 100644 app/Listeners/Account/CreateAccountActivity.php

diff --git a/app/Listeners/Account/CreateAccountActivity.php b/app/Listeners/Account/CreateAccountActivity.php
new file mode 100644
index 000000000000..465aa0788461
--- /dev/null
+++ b/app/Listeners/Account/CreateAccountActivity.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Listeners\Account;
+
+use App\Jobs\Mail\NinjaMailerJob;
+use App\Jobs\Mail\NinjaMailerObject;
+use App\Libraries\MultiDB;
+use App\Utils\Ninja;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class CreateAccountActivity implements ShouldQueue
+{
+
+    /**
+     * Create the event listener.
+     *
+     * @param ActivityRepository $activity_repo
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle($event)
+    {
+        MultiDB::setDb($event->company->db);
+
+        if(Ninja::isHosted())
+        {
+            $nmo = new NinjaMailerObject;
+            $nmo->mailable = new Modules\Admin\Mail\Welcome($event->user);
+            $nmo->company =  $event->company;
+            $nmo->settings = $event->company->settings;
+            $nmo->to_user = $event->user;
+
+            NinjaMailerJob::dispatch($nmo);
+        }
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 144710dbb598..ca4706fc599e 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -11,6 +11,7 @@
 
 namespace App\Providers;
 
+use App\Events\Account\AccountCreated;
 use App\Events\Client\ClientWasArchived;
 use App\Events\Client\ClientWasCreated;
 use App\Events\Client\ClientWasDeleted;
@@ -179,6 +180,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
+        AccountCreated::class =>[
+        ],
         MessageSending::class =>[
         ],
         MessageSent::class => [