resale license check needs to be updated

This commit is contained in:
Andras Bacsai 2023-11-02 14:10:29 +01:00
parent 3bffe3f010
commit a0031efce0
5 changed files with 13 additions and 14 deletions

View File

@ -4,26 +4,26 @@ namespace App\Actions\License;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Lorisleiva\Actions\Concerns\AsAction;
class CheckResaleLicense class CheckResaleLicense
{ {
public function __invoke() use AsAction;
public function handle()
{ {
try { try {
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
if (isDev()) {
$settings->update([ $settings->update([
'is_resale_license_active' => false, 'is_resale_license_active' => true,
]); ]);
if (isDev()) {
return;
}
if (!$settings->resale_license) {
return; return;
} }
// if (!$settings->resale_license) {
// return;
// }
$base_url = config('coolify.license_url'); $base_url = config('coolify.license_url');
if (isDev()) {
$base_url = 'http://host.docker.internal:8787';
}
$instance_id = config('app.id'); $instance_id = config('app.id');
ray("Checking license key against $base_url/lemon/validate"); ray("Checking license key against $base_url/lemon/validate");

View File

@ -23,7 +23,7 @@ class Kernel extends ConsoleKernel
// Instance Jobs // Instance Jobs
$schedule->command('horizon:snapshot')->everyMinute(); $schedule->command('horizon:snapshot')->everyMinute();
$schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer(); $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
// $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
// Server Jobs // Server Jobs
$this->check_scheduled_backups($schedule); $this->check_scheduled_backups($schedule);
$this->check_resources($schedule); $this->check_resources($schedule);

View File

@ -32,7 +32,7 @@ class CheckLicense extends Component
$this->settings->save(); $this->settings->save();
if ($this->settings->resale_license) { if ($this->settings->resale_license) {
try { try {
resolve(CheckResaleLicense::class)(); CheckResaleLicense::run();
$this->emit('reloadWindow'); $this->emit('reloadWindow');
} catch (\Throwable $e) { } catch (\Throwable $e) {
session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage()); session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());

View File

@ -21,7 +21,7 @@ class CheckResaleLicenseJob implements ShouldQueue, ShouldBeEncrypted
public function handle(): void public function handle(): void
{ {
try { try {
resolve(CheckResaleLicense::class)(); CheckResaleLicense::run();
} catch (\Throwable $e) { } catch (\Throwable $e) {
send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage()); send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage());
ray($e); ray($e);

View File

@ -25,7 +25,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
public function __construct(public Server $server) public function __construct(public Server $server)
{ {
$this->handle();
} }
public function middleware(): array public function middleware(): array
{ {