From 86fef3f40a92cc94b6133a6cdd4de493686185c1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 17 Mar 2021 22:30:26 -0700
Subject: [PATCH 1/2] Set SAML errors to warning instead of error

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Auth/LoginController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index c143a27210..001c45e7a1 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -111,7 +111,7 @@ class LoginController extends Controller
                     Auth::login($user, true);
                 } else {
                     $username = $saml->getUsername();
-                    Log::error("SAML user '$username' could not be found in database.");
+                    \Log::warning("SAML user '$username' could not be found in database.");
                     $request->session()->flash('error', trans('auth/message.signin.error'));
                     $saml->clearData();
                 }
@@ -121,7 +121,7 @@ class LoginController extends Controller
                     $user->save();
                 }
             } catch (\Exception $e) {
-                Log::error("There was an error authenticating the SAML user: " . $e->getMessage());
+                \Log::warning("There was an error authenticating the SAML user: " . $e->getMessage());
                 throw new \Exception($e->getMessage());
             }
         }

From 01143734682944a9859fd6331f87945e3d1e1d61 Mon Sep 17 00:00:00 2001
From: Jo Drexl <jo.drexl@jodrexl.de>
Date: Mon, 22 Mar 2021 20:57:26 +0100
Subject: [PATCH 2/2] Fixing #9224 (#9328)

---
 app/Models/Company.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Company.php b/app/Models/Company.php
index e6bd3dd773..04f138ccd0 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -78,7 +78,7 @@ final class Company extends SnipeModel
             $company_id = null;
         }
 
-        $table = ($table_name) ? DB::getTablePrefix().$table_name."." : '';
+        $table = ($table_name) ? $table_name."." : '';
 
         if(\Schema::hasColumn($query->getModel()->getTable(), $column)){
              return $query->where($table.$column, '=', $company_id);