fix: make uuid optional when adding user, hide field for no license

Fixes #16

Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
2022-10-21 18:46:33 +01:00
parent 9056ee131f
commit 1b7c144497
4 changed files with 12 additions and 7 deletions

View File

@@ -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

View File

@@ -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(),