From 1b7c1444974361e8d6b6150bd957c706136a1903 Mon Sep 17 00:00:00 2001
From: miguel456 <me@nogueira.codes>
Date: Fri, 21 Oct 2022 18:46:33 +0100
Subject: [PATCH] fix: make uuid optional when adding user, hide field for no
 license Fixes #16

Signed-off-by: miguel456 <me@nogueira.codes>
---
 app/Http/Controllers/Auth/DiscordController.php |  3 ++-
 app/Http/Controllers/UserController.php         |  2 ++
 app/Http/Requests/UpdateUserRequest.php         |  2 +-
 resources/views/dashboard/user/manage.blade.php | 12 +++++++-----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Auth/DiscordController.php b/app/Http/Controllers/Auth/DiscordController.php
index 6949a0c..efde879 100755
--- a/app/Http/Controllers/Auth/DiscordController.php
+++ b/app/Http/Controllers/Auth/DiscordController.php
@@ -22,6 +22,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Facades\Discord;
+use App\Facades\Options;
 use App\Http\Controllers\Controller;
 use App\User;
 use Illuminate\Support\Facades\Auth;
@@ -72,7 +73,7 @@ class DiscordController extends Controller
         } else {
 
             $oAuthUser = User::create([
-                'uuid' => Str::uuid(),
+                'uuid' => null,
                 'name' => $discordUser->getName(),
                 'email' => $discordUser->getEmail(),
                 'email_verified_at' => now(), // verify the account since it came from a trusted provider
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e2c1469..1afbfd1 100755
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -23,6 +23,7 @@ namespace App\Http\Controllers;
 
 use App\Ban;
 use App\Facades\IP;
+use App\Facades\Options;
 use App\Http\Requests\Add2FASecretRequest;
 use App\Http\Requests\BanUserRequest;
 use App\Http\Requests\ChangeEmailRequest;
@@ -184,6 +185,7 @@ class UserController extends Controller
                 'isSuspended' => $suspensionService->isSuspended($user),
                 'hasDiscord' => $user->hasDiscordConnection(),
                 'hasPassword' => $user->hasPassword(),
+                'requireLicense' => Options::getOption('requireGameLicense'),
                 'suspensionReason' => $suspensionService->getSuspensionReason($user),
                 'suspensionDuration' => $suspensionService->getSuspensionDuration($user),
                 'has2FA' => $user->has2FA(),
diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php
index 709f013..018a2c6 100755
--- a/app/Http/Requests/UpdateUserRequest.php
+++ b/app/Http/Requests/UpdateUserRequest.php
@@ -46,7 +46,7 @@ class UpdateUserRequest extends FormRequest
         return [
             'email' => 'required|email',
             'name' => 'required|string',
-            'uuid' => 'required|max:32|min:32',
+            'uuid' => 'nullable|max:32|min:32',
             'roles' => 'required_without_all',
         ];
     }
diff --git a/resources/views/dashboard/user/manage.blade.php b/resources/views/dashboard/user/manage.blade.php
index 0b8dde8..bebcbed 100755
--- a/resources/views/dashboard/user/manage.blade.php
+++ b/resources/views/dashboard/user/manage.blade.php
@@ -193,11 +193,13 @@
             <label for="name">{{__('Name')}}</label>
             <input {{ ($demoActive) ? 'disabled' : '' }} id="name" type="text" name="name" class="form-control" required value="{{ $user->name }}" />
 
-            <label for="uuid">{{ __('Mojang UUID (deprecated)') }}</label>
-            <input {{ ($demoActive) ? 'disabled' : '' }} id="uuid" type="text" name="uuid" class="form-control" required value="{{ $user->uuid ?? "disabled" }}" />
-            <p class="text-muted text-sm">
-                <i class="fas fa-exclamation-triangle"></i> {{__('If the setting "Require Valid Game License" is activated, editing this field may have unintended consequences. Proceed with caution.')}}
-            </p>
+            @if ($requireLicense)
+                <label for="uuid">{{ __('Mojang UUID (deprecated)') }}</label>
+                <input {{ ($demoActive) ? 'disabled' : '' }} id="uuid" type="text" name="uuid" class="form-control" required value="{{ $user->uuid ?? "disabled" }}" />
+                <p class="text-muted text-sm">
+                    <i class="fas fa-exclamation-triangle"></i> {{__('If the setting "Require Valid Game License" is activated, editing this field may have unintended consequences. Proceed with caution.')}}
+                </p>
+            @endif
 
             <div class="form-group mt-3">