Use Actions instead of direct call in controller

app/Actions/User/Save.php

@@ -5,7 +5,6 @@
 use App\Exceptions\ConflictingPropertyException;
 use App\Exceptions\InvalidPropertyException;
 use App\Exceptions\ModelDBException;
-use App\Http\Requests\Traits\HasPasswordTrait;
 use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 
@@ -36,7 +35,7 @@ public function do(User $user, string $username, ?string $password, bool $mayUpl
 		$user->username = $username;
 		$user->may_upload = $mayUpload;
 		$user->may_edit_own_settings = $mayEditOwnSettings;
-		if ($password !== null) {
+		if ($password !== null && $password !== '') {
 			$user->password = Hash::make($password);
 		}
 		$user->save();

app/Actions/User/TokenDisable.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Actions\User;
+
+use App\Exceptions\InvalidPropertyException;
+use App\Exceptions\ModelDBException;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+
+class TokenDisable
+{
+	/**
+	 * @throws InvalidPropertyException
+	 * @throws ModelDBException
+	 */
+	public function do(): User
+	{
+		/** @var User $user */
+		$user = Auth::user();
+		$user->token = null;
+		$user->save();
+
+		return $user;
+	}
+}

app/Actions/User/TokenReset.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Actions\User;
+
+use App\Exceptions\InvalidPropertyException;
+use App\Exceptions\ModelDBException;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+
+class TokenReset
+{
+	/**
+	 * @throws InvalidPropertyException
+	 * @throws ModelDBException
+	 */
+	public function do(): string
+	{
+		/** @var User $user */
+		$user = Auth::user();
+		$token = strtr(base64_encode(random_bytes(16)), '+/', '-_');
+		$user->token = hash('SHA512', $token);
+		$user->save();
+
+		return $token;
+	}
+}

app/Http/Controllers/Administration/UserController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Administration;
 
 use App\Actions\Settings\UpdateLogin;
+use App\Actions\User\TokenDisable;
+use App\Actions\User\TokenReset;
 use App\Contracts\Exceptions\InternalLycheeException;
 use App\Exceptions\Internal\FrameworkException;
 use App\Exceptions\ModelDBException;
@@ -94,13 +96,9 @@ public function getAuthenticatedUser(): UserResource
 	 * @throws ModelDBException
 	 * @throws \Exception
 	 */
-	public function resetToken(ChangeTokenRequest $request): array
+	public function resetToken(ChangeTokenRequest $request, TokenReset $tokenReset): array
 	{
-		/** @var User $user */
-		$user = Auth::user();
-		$token = strtr(base64_encode(random_bytes(16)), '+/', '-_');
-		$user->token = hash('SHA512', $token);
-		$user->save();
+		$token = $tokenReset->do();
 
 		return ['token' => $token];
 	}
@@ -113,11 +111,8 @@ public function resetToken(ChangeTokenRequest $request): array
 	 * @throws UnauthenticatedException
 	 * @throws ModelDBException
 	 */
-	public function unsetToken(ChangeTokenRequest $request): void
+	public function unsetToken(ChangeTokenRequest $request, TokenDisable $tokenDisable): void
 	{
-		/** @var User $user */
-		$user = Auth::user();
-		$user->token = null;
-		$user->save();
+		$tokenDisable->do();
 	}
 }