A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: merge guest playback data on login and register
aminnausinb5d7e1633498
diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.phpindex c7a3bbc7..43981184 100755--- a/app/Http/Controllers/Api/V1/AuthController.php+++ b/app/Http/Controllers/Api/V1/AuthController.php@@ -7,6 +7,7 @@ use App\Http\Requests\UserLoginRequest;use App\Http\Requests\UserStoreRequest;use App\Http\Resources\UserResource;use App\Models\User;+use App\Services\Auth\GuestMergeService;use App\Traits\HttpResponses;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;@@ -15,6 +16,8 @@ use Illuminate\Support\Facades\Hash;class AuthController extends Controller {use HttpResponses;+ public function __construct(private readonly GuestMergeService $guestMergeService) {}+/*** Attempt to authenticate the request's credentials_me.*/@@ -28,6 +31,8 @@ class AuthController extends Controller {$user = User::where('email', $validated['email'])->first(); // Should remove$token = $user->createToken('API token for ' . $user->name)->plainTextToken; // Should remove+ $this->guestMergeService->merge($user, $request->header('X-Guest-Token'));+$request->session()->regenerate();return response()->json([@@ -45,6 +50,8 @@ class AuthController extends Controller {'password' => Hash::make($validated['password']),]);+ $this->guestMergeService->merge($user, $request->header('X-Guest-Token'));+if ($request->expectsJson()) {Auth::login($user);$token = $user->createToken('API token for ' . $user->name)->plainTextToken; // Legacy