From 508a42e6c55ece748021d4f6a8ffc6d993d16b8f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 19 Jun 2022 20:33:43 +1000
Subject: [PATCH 1/6] Fixes for json columsn

---
 ..._05_30_184320_add_job_related_fields_to_schedulers_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php b/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
index 74eb19fed7ab..36f877cc2b76 100644
--- a/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
+++ b/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
@@ -24,7 +24,7 @@ class AddJobRelatedFieldsToSchedulersTable extends Migration
         Schema::table('schedulers', function (Blueprint $table) {
             $table->string('action_name')->index();
             $table->string('action_class');
-            $table->json('parameters')->nullable();
+            $table->mediumText('parameters')->nullable();
         });
     }
 

From 3d968d31e6cf9f0f9faedd11067e1762fc8295a9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 20 Jun 2022 16:28:03 +1000
Subject: [PATCH 2/6] Add microsoft oauth to index.html

---
 app/Http/Requests/Payment/UpdatePaymentRequest.php |  4 +++-
 resources/views/index/index.blade.php              | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php
index ed6f19c2cf64..766aae657d82 100644
--- a/app/Http/Requests/Payment/UpdatePaymentRequest.php
+++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php
@@ -73,7 +73,9 @@ class UpdatePaymentRequest extends Request
 
         if (isset($input['invoices']) && is_array($input['invoices']) !== false) {
             foreach ($input['invoices'] as $key => $value) {
-                $input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
+
+                if(array_key_exists('invoice_id', $input['invoices'][$key]))
+                    $input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
             }
         }
         $this->replace($input);
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 99a10c3303b9..04bef3433d15 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -152,6 +152,18 @@
 
   <script defer src="{{ $path }}?v={{ config('ninja.app_version') }}" type="application/javascript"></script>
 
+
+  <script type="text/javascript" 
+    src="https://alcdn.msauth.net/browser/2.14.2/js/msal-browser.min.js"
+    integrity="sha384-ggh+EF1aSqm+Y4yvv2n17KpurNcZTeYtUZUvhPziElsstmIEubyEB6AIVpKLuZgr"
+    crossorigin="anonymous">
+  </script>
+  <script type="text/javascript">
+    if (location.hash.includes("id_token")) {
+      new PublicClientApplication("1023b9ce-5b09-4f04-98f8-e1ed85a72332", null, null);
+    }
+  </script>
+  
   <center style="padding-top: 150px" id="loader">
     <div class="loader"></div>
   </center>

From c188c6fb104a91140614b5c6341b2156cf8872fa Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 20 Jun 2022 16:51:42 +1000
Subject: [PATCH 3/6] Changes for index

---
 resources/views/index/index.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 04bef3433d15..1b8d24f90d1b 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -160,7 +160,8 @@
   </script>
   <script type="text/javascript">
     if (location.hash.includes("id_token")) {
-      new PublicClientApplication("1023b9ce-5b09-4f04-98f8-e1ed85a72332", null, null);
+        open(location, '_self').close()
+        window.close()
     }
   </script>
   

From 464bbd57c7ed59ef1df71d9561e35f80f3552714 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 20 Jun 2022 16:55:54 +1000
Subject: [PATCH 4/6] Changes for index

---
 resources/views/index/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 1b8d24f90d1b..bb41419dde2b 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -159,7 +159,7 @@
     crossorigin="anonymous">
   </script>
   <script type="text/javascript">
-    if (location.hash.includes("id_token")) {
+    if (location.hash.includes("code")) {
         open(location, '_self').close()
         window.close()
     }

From 8f08c2f2dba0cf51aead1cb49f1c0f3fa540f16a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 20 Jun 2022 17:02:34 +1000
Subject: [PATCH 5/6] Changes for index

---
 resources/views/index/index.blade.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index bb41419dde2b..bb967c83dbbf 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -159,10 +159,11 @@
     crossorigin="anonymous">
   </script>
   <script type="text/javascript">
-    if (location.hash.includes("code")) {
-        open(location, '_self').close()
-        window.close()
-    }
+    window.onload = function() {
+      if (location.hash.includes("code")) {
+        new PublicClientApplication("1023b9ce-5b09-4f04-98f8-e1ed85a72332", null, null);
+      }
+    };
   </script>
   
   <center style="padding-top: 150px" id="loader">

From 12ce5fdaa3c5531d50a722a89fbdee93c18a54bc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 20 Jun 2022 17:40:46 +1000
Subject: [PATCH 6/6] Microsoft OAuth

---
 resources/views/index/index.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index bb967c83dbbf..b79858bc4e3b 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -159,11 +159,11 @@
     crossorigin="anonymous">
   </script>
   <script type="text/javascript">
-    window.onload = function() {
-      if (location.hash.includes("code")) {
-        new PublicClientApplication("1023b9ce-5b09-4f04-98f8-e1ed85a72332", null, null);
-      }
-    };
+window.onload = function() {
+  if (location.hash.includes("code")) {
+    new msal.PublicClientApplication({auth: {clientId: "1023b9ce-5b09-4f04-98f8-e1ed85a72332"}});
+  }
+};
   </script>
   
   <center style="padding-top: 150px" id="loader">