From 693d84b243ecb11514eb13a7c1e7a8eb0a222424 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 15 Jan 2022 15:58:33 +1100
Subject: [PATCH] Session handling with custom domains

---
 app/Http/Kernel.php                    |  3 ++
 app/Http/Middleware/SessionDomains.php | 38 ++++++++++++++++++++++++++
 app/Mail/Import/ImportCompleted.php    |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 app/Http/Middleware/SessionDomains.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 6b82749df99c..5bf09545f8f8 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -28,6 +28,7 @@ use App\Http\Middleware\PasswordProtection;
 use App\Http\Middleware\PhantomSecret;
 use App\Http\Middleware\QueryLogging;
 use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Http\Middleware\SessionDomains;
 use App\Http\Middleware\SetDb;
 use App\Http\Middleware\SetDbByCompanyKey;
 use App\Http\Middleware\SetDocumentDb;
@@ -103,6 +104,7 @@ class Kernel extends HttpKernel
             'query_logging',
         ],
         'client' => [
+            SessionDomains::class,
             EncryptCookies::class,
             AddQueuedCookiesToResponse::class,
             StartSession::class,
@@ -165,6 +167,7 @@ class Kernel extends HttpKernel
 
 
     protected $middlewarePriority = [
+        SessionDomains::class,
         Cors::class,
         SetDomainNameDb::class,
         SetDb::class,
diff --git a/app/Http/Middleware/SessionDomains.php b/app/Http/Middleware/SessionDomains.php
new file mode 100644
index 000000000000..b0f36564554f
--- /dev/null
+++ b/app/Http/Middleware/SessionDomains.php
@@ -0,0 +1,38 @@
+<?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://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Middleware;
+
+use App\Utils\Ninja;
+use Closure;
+use Illuminate\Http\Request;
+
+class SessionDomains
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param  Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+
+        if(Ninja::isSelfHost())
+            return $next($request);
+
+        
+        config(['session.domain' => '.' . $request->getHost()]);
+        
+        return $next($request);        
+    }
+}
\ No newline at end of file
diff --git a/app/Mail/Import/ImportCompleted.php b/app/Mail/Import/ImportCompleted.php
index 2a1e04da60f9..58a4420f7f01 100644
--- a/app/Mail/Import/ImportCompleted.php
+++ b/app/Mail/Import/ImportCompleted.php
@@ -49,6 +49,8 @@ class ImportCompleted extends Mailable
     {
 
         App::forgetInstance('translator');
+        App::setLocale($this->company->getLocale());
+
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->company->settings));