miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #16

Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
Miguel Nogueira 2022-10-21 18:46:33 +01:00
parent 9056ee131f
commit 1b7c144497
No known key found for this signature in database
GPG Key ID: 3C6A7E29AF26D370
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Auth/DiscordController.php
View File

@ -22,6 +22,7 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Facades\Discord; use App\Facades\Discord;
use App\Facades\Options;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\User; use App\User;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
@ -72,7 +73,7 @@ class DiscordController extends Controller
} else { } else {
$oAuthUser = User::create([ $oAuthUser = User::create([
'uuid' => Str::uuid(), 'uuid' => null,
'name' => $discordUser->getName(), 'name' => $discordUser->getName(),
'email' => $discordUser->getEmail(), 'email' => $discordUser->getEmail(),
'email_verified_at' => now(), // verify the account since it came from a trusted provider 'email_verified_at' => now(), // verify the account since it came from a trusted provider

2
app/Http/Controllers/UserController.php
View File

@ -23,6 +23,7 @@ namespace App\Http\Controllers;
use App\Ban; use App\Ban;
use App\Facades\IP; use App\Facades\IP;
use App\Facades\Options;
use App\Http\Requests\Add2FASecretRequest; use App\Http\Requests\Add2FASecretRequest;
use App\Http\Requests\BanUserRequest; use App\Http\Requests\BanUserRequest;
use App\Http\Requests\ChangeEmailRequest; use App\Http\Requests\ChangeEmailRequest;
@ -184,6 +185,7 @@ class UserController extends Controller
'isSuspended' => $suspensionService->isSuspended($user), 'isSuspended' => $suspensionService->isSuspended($user),
'hasDiscord' => $user->hasDiscordConnection(), 'hasDiscord' => $user->hasDiscordConnection(),
'hasPassword' => $user->hasPassword(), 'hasPassword' => $user->hasPassword(),
'requireLicense' => Options::getOption('requireGameLicense'),
'suspensionReason' => $suspensionService->getSuspensionReason($user), 'suspensionReason' => $suspensionService->getSuspensionReason($user),
'suspensionDuration' => $suspensionService->getSuspensionDuration($user), 'suspensionDuration' => $suspensionService->getSuspensionDuration($user),
'has2FA' => $user->has2FA(), 'has2FA' => $user->has2FA(),

2
app/Http/Requests/UpdateUserRequest.php
View File

@ -46,7 +46,7 @@ class UpdateUserRequest extends FormRequest
return [ return [
'email' => 'required|email', 'email' => 'required|email',
'name' => 'required|string', 'name' => 'required|string',
'uuid' => 'required|max:32|min:32', 'uuid' => 'nullable|max:32|min:32',
'roles' => 'required_without_all', 'roles' => 'required_without_all',
]; ];
} }

12
resources/views/dashboard/user/manage.blade.php
View File

@ -193,11 +193,13 @@
<label for="name">{{__('Name')}}</label> <label for="name">{{__('Name')}}</label>
<input {{ ($demoActive) ? 'disabled' : '' }} id="name" type="text" name="name" class="form-control" required value="{{ $user->name }}" /> <input {{ ($demoActive) ? 'disabled' : '' }} id="name" type="text" name="name" class="form-control" required value="{{ $user->name }}" />
<label for="uuid">{{ __('Mojang UUID (deprecated)') }}</label> @if ($requireLicense)
<input {{ ($demoActive) ? 'disabled' : '' }} id="uuid" type="text" name="uuid" class="form-control" required value="{{ $user->uuid ?? "disabled" }}" /> <label for="uuid">{{ __('Mojang UUID (deprecated)') }}</label>
<p class="text-muted text-sm"> <input {{ ($demoActive) ? 'disabled' : '' }} id="uuid" type="text" name="uuid" class="form-control" required value="{{ $user->uuid ?? "disabled" }}" />
<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 class="text-muted text-sm">
</p> <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"> <div class="form-group mt-3">