From 701295af34caaa3e503760d7cba974ece25304a4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 12:23:02 +1000 Subject: [PATCH 1/6] Fixes for microsoft login --- app/Http/Controllers/Auth/LoginController.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index a32ea52c4efb..4d496a01ed58 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -418,6 +418,8 @@ class LoginController extends BaseController ->setReturnType(Model\User::class) ->execute(); + nlog($user); + if ($user) { $account = request()->input('account'); @@ -437,15 +439,15 @@ class LoginController extends BaseController } //If this is a result user/email combo - lets add their OAuth details details - if ($existing_login_user = MultiDB::hasUser(['email' => $email])) { - if (!$existing_login_user->account) { - return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400); - } + // if ($existing_login_user = MultiDB::hasUser(['email' => $email])) { + // if (!$existing_login_user->account) { + // return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400); + // } - Auth::login($existing_login_user, true); + // Auth::login($existing_login_user, true); - return $this->existingLoginUser($user->getId(), 'microsoft'); - } + // return $this->existingLoginUser($user->getId(), 'microsoft'); + // } // Signup! From b6ebb0ebcfae3bd3c8d19ea109857761e2748be5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 12:58:37 +1000 Subject: [PATCH 2/6] Fixes for document length display in client portal --- .../ninja2020/components/livewire/documents-table.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php b/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php index f79a5d206773..4f7d153760df 100644 --- a/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php @@ -94,8 +94,8 @@ - - {{ Illuminate\Support\Str::limit($document->name, 40) }} + + {{ $document->name }} From ae877d334043704ea1eaec2e46e69a25815c6882 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 13:21:40 +1000 Subject: [PATCH 3/6] Minor fixes for create test data --- app/Console/Commands/CreateTestData.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index cd94c3ab70c2..ca8417573ce7 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -61,6 +61,8 @@ class CreateTestData extends Command protected $invoice_repo; + protected $count; + /** * Execute the console command. * From 6daa68d0419dba10016acbe962b5f2138dc4ba00 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 13:22:11 +1000 Subject: [PATCH 4/6] 5.7.15 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index db53e5ced845..dcfab7848c1e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.7.14 \ No newline at end of file +5.7.15 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 1f9ecb8e6d1d..d71dd9f24f70 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ '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.14'), - 'app_tag' => env('APP_TAG','5.7.14'), + 'app_version' => env('APP_VERSION','5.7.15'), + 'app_tag' => env('APP_TAG','5.7.15'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), From a388fced1985b1c473b2aff8f22ee9fd16271f3f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 16:34:57 +1000 Subject: [PATCH 5/6] Prioritize principle name for microsoft authentication --- app/Http/Controllers/Auth/LoginController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 4d496a01ed58..25080f33d190 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -423,7 +423,7 @@ class LoginController extends BaseController if ($user) { $account = request()->input('account'); - $email = $user->getMail() ?: $user->getUserPrincipalName(); + $email = $user->getUserPrincipalName() ?: $user->getMail(); $query = [ 'oauth_user_id' => $user->getId(), From 9f085dabe31f1b6faa0be0377cd03c4d8a6de89e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 20 Sep 2023 16:36:22 +1000 Subject: [PATCH 6/6] v5.7.16 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index dcfab7848c1e..d6542901dfb1 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.7.15 \ No newline at end of file +5.7.16 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index d71dd9f24f70..3fee705c8da1 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ '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', ''),