From 83d7590b600ad77c6305126b923c6c2ef03c4673 Mon Sep 17 00:00:00 2001
From: 1day2die <ownerdennis8@gmail.com>
Date: Sun, 30 Apr 2023 12:13:01 +0200
Subject: [PATCH] fix installer, new users get role

---
 .../Controllers/Auth/RegisterController.php   |  2 +
 .../2023_04_03_231829_update_users_table.php  |  2 +-
 .../2023_04_29_233120_drop_roles.php          | 51 -------------------
 database/seeders/PermissionsSeeder.php        | 11 ++--
 public/install/forms.php                      | 10 ++--
 5 files changed, 18 insertions(+), 58 deletions(-)
 delete mode 100644 database/migrations/2023_04_29_233120_drop_roles.php

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 29a4b6e0..9f1e8019 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -139,6 +139,8 @@ class RegisterController extends Controller
 
         ]);
 
+        $user->syncRoles(4);
+
         $response = $this->pterodactyl->application->post('/application/users', [
             'external_id' => $user->pterodactyl_id,
             'username' => $user->name,
diff --git a/database/migrations/2023_04_03_231829_update_users_table.php b/database/migrations/2023_04_03_231829_update_users_table.php
index 3caf98aa..df249741 100644
--- a/database/migrations/2023_04_03_231829_update_users_table.php
+++ b/database/migrations/2023_04_03_231829_update_users_table.php
@@ -26,7 +26,7 @@ return new class extends Migration
     public function down()
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->integer('pterodactyl_id')->nullable->change();
+            $table->integer('pterodactyl_id')->nullable()->change();
         });
     }
 };
diff --git a/database/migrations/2023_04_29_233120_drop_roles.php b/database/migrations/2023_04_29_233120_drop_roles.php
deleted file mode 100644
index 3f365707..00000000
--- a/database/migrations/2023_04_29_233120_drop_roles.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-use App\Models\User;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Artisan::call('db:seed', [
-            '--class' => 'PermissionsSeeder',
-        ]);
-
-        Schema::table('users', function ($table) {
-            $table->dropColumn('role');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('users', function($table) {
-            $table->string('role')->default('member');
-        });
-
-        $users = User::with('roles')->get();
-        foreach($users as $user){
-            if($user->hasRole(1)){
-                $user->role = "admin";
-            }elseif ($user->hasRole(3)){
-                $user->role = "client";
-            }else{
-                $user->role = "member";
-            }
-            $user->save();
-        }
-
-    }
-};
diff --git a/database/seeders/PermissionsSeeder.php b/database/seeders/PermissionsSeeder.php
index 7d6ebc06..e688bdf0 100644
--- a/database/seeders/PermissionsSeeder.php
+++ b/database/seeders/PermissionsSeeder.php
@@ -32,9 +32,14 @@ class PermissionsSeeder extends Seeder
             $admin->syncRoles(1);
         }
 
-        $admins = User::where("role","client")->get();
-        foreach($admins as $admin) {
-            $admin->syncRoles(3);
+        $mods = User::where("role","moderator")->get();
+        foreach($mods as $mod) {
+            $mod->syncRoles(2);
+        }
+
+        $clients = User::where("role","client")->get();
+        foreach($clients as $client) {
+            $client->syncRoles(3);
         }
 
 
diff --git a/public/install/forms.php b/public/install/forms.php
index d6d72b92..726e22ec 100644
--- a/public/install/forms.php
+++ b/public/install/forms.php
@@ -1,5 +1,7 @@
 <?php
-
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
 
 use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\PHPMailer;
@@ -77,6 +79,7 @@ if (isset($_POST['feedDB'])) {
     $logs .= run_console('php artisan storage:link');
     $logs .= run_console('php artisan migrate --seed --force');
     $logs .= run_console('php artisan db:seed --class=ExampleItemsSeeder --force');
+    $logs .= run_console('php artisan db:seed --class=PermissionsSeeder --force');
 
     wh_log($logs, 'debug');
 
@@ -292,8 +295,9 @@ if (isset($_POST['createUser'])) {
     }
 
     $random = generateRandomString();
-    $query1 = 'INSERT INTO `' . getenv('DB_DATABASE') . "`.`users` (`name`, `credits`, `server_limit`, `pterodactyl_id`, `email`, `password`, `created_at`, `referral_code`) VALUES ('$name', 'admin', '250', '1', '$pteroID', '$mail', '$pass', CURRENT_TIMESTAMP, '$random')";
-    $query2 = 'INSERT INTO `' . getenv('DB_DATABASE') . "`.`model_has_roles` (`role_id`, `model_type`, `model_id`) VALUES ('1', 'App\Models\User', '1')";
+
+    $query1 = 'INSERT INTO `' . getenv('DB_DATABASE') . "`.`users` (`name`, `role`, `credits`, `server_limit`, `pterodactyl_id`, `email`, `password`, `created_at`, `referral_code`) VALUES ('$name', 'admin', '250', '1', '$pteroID', '$mail', '$pass', CURRENT_TIMESTAMP, '$random')";
+    $query2 = "INSERT INTO `" . getenv('DB_DATABASE') . "`.`model_has_roles` (`role_id`, `model_type`, `model_id`) VALUES ('1', 'App\\\Models\\\User', '1')";
     if ($db->query($query1) && $db->query($query2)) {
         wh_log('Created user with Email ' . $mail . ' and pterodactyl ID ' . $pteroID, 'info');
         header('LOCATION: index.php?step=7');