From 952d335789c9a13c44b78f5f291e04c1a491184f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 14 Aug 2023 16:56:13 +0200
Subject: [PATCH] refactor is_instance_admin

---
 app/Http/Controllers/Controller.php              |  2 +-
 app/Http/Controllers/ServerController.php        |  2 +-
 app/Http/Middleware/SubscriptionValid.php        | 10 +++++++---
 bootstrap/helpers/shared.php                     |  5 +++++
 bootstrap/helpers/subscriptions.php              | 16 ++++++++++------
 .../components/layout-subscription.blade.php     |  2 +-
 resources/views/components/navbar.blade.php      |  4 ++--
 .../notifications/email-settings.blade.php       |  2 +-
 resources/views/team/members.blade.php           |  2 +-
 9 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 7284277e8..9c39b3a03 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -59,7 +59,7 @@ public function dashboard()
 
     public function settings()
     {
-        if (auth()->user()->isInstanceAdmin()) {
+        if (is_instance_admin()) {
             $settings = InstanceSettings::get();
             $database = StandalonePostgresql::whereName('coolify-db')->first();
             if ($database) {
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index dc98fc258..e7f9feb57 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -12,7 +12,7 @@ class ServerController extends Controller
 
     public function new_server()
     {
-        if (!is_cloud()) {
+        if (!is_cloud() || is_instance_admin()) {
             return view('server.create', [
                 'limit_reached' => false,
                 'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
diff --git a/app/Http/Middleware/SubscriptionValid.php b/app/Http/Middleware/SubscriptionValid.php
index 7d6cd5cfa..4c9d7b940 100644
--- a/app/Http/Middleware/SubscriptionValid.php
+++ b/app/Http/Middleware/SubscriptionValid.php
@@ -10,16 +10,20 @@ class SubscriptionValid
 {
     public function handle(Request $request, Closure $next): Response
     {
-        $is_instance_admin = auth()->user()?->isInstanceAdmin();
 
         if (!auth()->user() || !is_cloud()) {
-            if ($request->path() === 'subscription' &&  !$is_instance_admin) {
+            if ($request->path() === 'subscription') {
                 return redirect('/');
             } else {
                 return $next($request);
             }
         }
-        if (is_subscription_active() && $request->path() === 'subscription' && !$is_instance_admin) {
+        $is_instance_admin = is_instance_admin();
+        if ($is_instance_admin) {
+            return $next($request);
+        }
+
+        if (is_subscription_active() && $request->path() === 'subscription') {
             return redirect('/');
         }
         if (is_subscription_in_grace_period()) {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index e6a8eed91..14b6ed75a 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -29,6 +29,11 @@ function generate_readme_file(string $name, string $updated_at): string
     return "Resource name: $name\nLatest Deployment Date: $updated_at";
 }
 
+function is_instance_admin()
+{
+    return auth()->user()?->isInstanceAdmin();
+}
+
 function general_error_handler(Throwable|null $err = null, $that = null, $isJson = false, $customErrorMessage = null): mixed
 {
     try {
diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php
index d362591b7..90d0947ad 100644
--- a/bootstrap/helpers/subscriptions.php
+++ b/bootstrap/helpers/subscriptions.php
@@ -46,19 +46,21 @@ function getEndDate()
 function is_subscription_active()
 {
     $team = auth()->user()?->currentTeam();
+
     if (!$team) {
         return false;
     }
+    if (is_instance_admin()) {
+        return true;
+    }
     $subscription = $team?->subscription;
+
     if (!$subscription) {
         return false;
     }
-
     $is_active = $subscription->lemon_status === 'active';
-    $is_instance_admin = auth()->user()->isInstanceAdmin();
-    ray($is_instance_admin);
 
-    return $is_active || $is_instance_admin;
+    return $is_active;
 }
 function is_subscription_in_grace_period()
 {
@@ -66,13 +68,15 @@ function is_subscription_in_grace_period()
     if (!$team) {
         return false;
     }
+    if (is_instance_admin()) {
+        return true;
+    }
     $subscription = $team?->subscription;
     if (!$subscription) {
         return false;
     }
-    $is_instance_admin = auth()->user()->isInstanceAdmin();
     $is_still_grace_period = $subscription->lemon_ends_at &&
         Carbon::parse($subscription->lemon_ends_at) > Carbon::now();
 
-    return $is_still_grace_period || $is_instance_admin;
+    return $is_still_grace_period;
 }
diff --git a/resources/views/components/layout-subscription.blade.php b/resources/views/components/layout-subscription.blade.php
index b2b8f67de..b479b29e2 100644
--- a/resources/views/components/layout-subscription.blade.php
+++ b/resources/views/components/layout-subscription.blade.php
@@ -25,7 +25,7 @@
 <body>
     @livewireScripts
     <x-toaster-hub />
-    @if (auth()->user()->isInstanceAdmin() || is_subscription_in_grace_period())
+    @if (is_instance_admin() || is_subscription_in_grace_period())
         <div class="fixed top-3 left-4" id="vue">
             <magic-bar></magic-bar>
         </div>
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index e0fd6e22e..11c297ecd 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -51,7 +51,7 @@ class="{{ request()->is('command-center') ? 'text-warning icon' : 'icon' }}" vie
                 </a>
             </li>
             <div class="flex-1"></div>
-            @if (auth()->user()->isInstanceAdmin())
+            @if (is_instance_admin())
                 <livewire:upgrade />
             @endif
             <li title="Profile">
@@ -79,7 +79,7 @@ class="{{ request()->is('command-center') ? 'text-warning icon' : 'icon' }}" vie
                     </svg>
                 </a>
             </li>
-            @if (auth()->user()->isInstanceAdmin())
+            @if (is_instance_admin())
                 <li title="Settings" class="mt-auto">
                     <a class="hover:bg-transparent" @if (!request()->is('settings')) href="/settings" @endif>
                         <svg xmlns="http://www.w3.org/2000/svg"
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index 344264def..c67a6098a 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -16,7 +16,7 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
-            @if (auth()->user()->isInstanceAdmin())
+            @if (is_instance_admin())
                 <x-forms.button wire:click='copyFromInstanceSettings'>
                     Copy from Instance Settings
                 </x-forms.button>
diff --git a/resources/views/team/members.blade.php b/resources/views/team/members.blade.php
index 011614194..9cb8fa2e8 100644
--- a/resources/views/team/members.blade.php
+++ b/resources/views/team/members.blade.php
@@ -26,7 +26,7 @@
                 <h3 class="pb-4">Invite a new member</h3>
             @else
                 <h3>Invite a new member</h3>
-                @if (auth()->user()->isInstanceAdmin())
+                @if (is_instance_admin())
                     <div class="pb-4 text-xs text-warning">You need to configure <a href="/settings/emails"
                             class="underline text-warning">Transactional
                             Emails</a>