wip

app/Http/Controllers/Controller.php

@@ -17,9 +17,11 @@ class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
 
-    public function license()
+    public function subscription()
     {
-        return view('license');
+        return view('subscription', [
+            'settings' => InstanceSettings::get()
+        ]);
     }
     public function dashboard()
     {

app/Http/Kernel.php

@@ -21,7 +21,6 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\LicenseValid::class,
 
     ];
 

app/Http/Livewire/CheckLicense.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use App\Actions\License\CheckResaleLicense;
+use App\Models\InstanceSettings;
+use Livewire\Component;
+
+class CheckLicense extends Component
+{
+    public InstanceSettings|null $settings = null;
+    public string|null $instance_id = null;
+    protected $rules = [
+        'settings.resale_license' => 'nullable',
+        'settings.is_resale_license_active' => 'nullable',
+    ];
+    protected $validationAttributes = [
+        'settings.resale_license' => 'License',
+        'instance_id' => 'Instance Id (Do not change this)',
+        'settings.is_resale_license_active' => 'Is License Active',
+    ];
+    public function mount()
+    {
+        $this->instance_id = config('app.id');
+        $this->settings = InstanceSettings::get();
+    }
+    public function submit()
+    {
+        $this->validate();
+        $this->settings->save();
+        if ($this->settings->resale_license) {
+            try {
+                resolve(CheckResaleLicense::class)();
+                $this->emit('reloadWindow');
+            } catch (\Throwable $th) {
+                session()->flash('error', 'License is not valid. Please contact support.');
+                ray($th->getMessage());
+                return redirect()->to('/subscription');
+            }
+        }
+    }
+}

app/Http/Livewire/Settings/Configuration.php

@@ -5,6 +5,7 @@ namespace App\Http\Livewire\Settings;
 use App\Jobs\ProxyCheckJob;
 use App\Models\InstanceSettings as ModelsInstanceSettings;
 use App\Models\Server;
+use Illuminate\Support\Facades\Http;
 use Livewire\Component;
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
@@ -21,11 +22,13 @@ class Configuration extends Component
 
     protected $rules = [
         'settings.fqdn' => 'nullable',
+        'settings.resale_license' => 'nullable',
         'settings.public_port_min' => 'required',
         'settings.public_port_max' => 'required',
     ];
     protected $validationAttributes = [
         'settings.fqdn' => 'FQDN',
+        'settings.resale_license' => 'Resale License',
         'settings.public_port_min' => 'Public port min',
         'settings.public_port_max' => 'Public port max',
     ];

app/Http/Middleware/LicenseValid.php

@@ -16,15 +16,21 @@ class LicenseValid
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (isCloud() && !isDev()) {
+        if (isCloud()) {
             $value = Cache::get('license_key');
+            if (isDev()) {
+                $value = true;
+            }
             if (!$value) {
-                ray($request->path());
                 if ($request->path() !== 'license' && $request->path() !== 'livewire/message/license') {
                     return redirect('license');
                 }
+            } else {
+                if ($request->path() === 'license' || $request->path() === 'livewire/message/license') {
+                    return redirect('home');
+                }
             }
         }
         return $next($request);
     }
-}
+}

app/Http/Middleware/SubscriptionValid.php

@@ -4,33 +4,34 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
 use Symfony\Component\HttpFoundation\Response;
 
 class SubscriptionValid
 {
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
+
     public function handle(Request $request, Closure $next): Response
     {
         $allowed_paths = [
-            'team',
-            'livewire/message/team',
+            'subscription',
             'login',
             'register',
-            'livewire/message/switch-team',
             'logout',
+            'livewire/message/check-license',
+            'livewire/message/switch-team',
         ];
-        if (isCloud()) {
-           if (!$request->user()?->currentTeam()?->subscription && $request->user()?->currentTeam()->subscription?->lemon_status !== 'active') {
+        if (isCloud() && !isSubscribed()) {
+            ray('SubscriptionValid Middleware');
             if (!in_array($request->path(), $allowed_paths)) {
-                return redirect('team');
+                return redirect('subscription');
+            } else {
+                return $next($request);
             }
+        } else {
+            if ($request->path() === 'subscription') {
+                return redirect('/');
+            } else {
+                return $next($request);
             }
         }
-        return $next($request);
     }
-}
+}