fix namespace psr4 + load location of user

omatech · May 21, 2020 · 750b2cc · 750b2cc
1 parent 46fd9e3
commit 750b2cc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,9 @@
     ],
     "autoload": {
         "psr-4": {
-            "Omatech\\Mage\\": "src"
+            "Omatech\\Mage\\": "src",
+            "Omatech\\Mage\\App\\": "src/app",
+            "Omatech\\Mage\\Database\\Seeds\\": "src/database/seeds"
         }
     },
     "extra": {

diff --git a/src/app/Http/Controllers/Auth/LoginController.php b/src/app/Http/Controllers/Auth/LoginController.php
@@ -96,5 +96,13 @@ protected function authenticated(Request $request, $user)
         if ($hasPermission == false) {
             throw new UnauthorizedException($user);
         }
+
+        if (auth()->check() == true || auth()->guard('mage')->check() == true) {
+            $user = auth()->user() ?? auth()->guard('mage')->user();
+        }
+
+        if (isset($user->language)) {
+            session(['locale' =>  $user->language]);
+        }
     }
 }
diff --git a/src/app/Http/Middleware/SetLocale.php b/src/app/Http/Middleware/SetLocale.php
@@ -16,6 +16,8 @@ class SetLocale
      */
     public function handle($request, Closure $next)
     {
+        $locale = null;
+
         foreach (config('mage.translations.available_locales') as $locale) {
             if ($locale['locale'] == session('locale')) {
                 $locale = session('locale');