Merge pull request #8814 from turbo124/v5-develop

v5.7.16
invoiceninja · Sep 20, 2023 · 4b6f049 · 4b6f049
2 parents c560c34 + 9f085da
commit 4b6f049
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-5.7.15
+5.7.16
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -423,7 +423,7 @@ private function handleMicrosoftOauth()
         if ($user) {
             $account = request()->input('account');
 
-            $email = $user->getMail() ?: $user->getUserPrincipalName();
+            $email = $user->getUserPrincipalName() ?: $user->getMail();
 
             $query = [
                 'oauth_user_id' => $user->getId(),

diff --git a/config/ninja.php b/config/ninja.php
@@ -15,8 +15,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.15'),
-    'app_tag' => env('APP_TAG','5.7.15'),
+    'app_version' => env('APP_VERSION','5.7.16'),
+    'app_tag' => env('APP_TAG','5.7.16'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),