Skip to content

A self-hosted media server and file management system

fix: session management and login complexity

aminnausin9fee76ee331c
diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.php
index 6ca83e69..ddc1e1a9 100755
--- a/app/Http/Controllers/Api/V1/AuthController.php
+++ b/app/Http/Controllers/Api/V1/AuthController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1;
use App\Http\Controllers\Controller;
use App\Http\Requests\UserLoginRequest;
use App\Http\Requests\UserStoreRequest;
+use App\Http\Resources\UserResource;
use App\Models\User;
use App\Traits\HttpResponses;
use Illuminate\Http\Request;
@@ -15,36 +16,25 @@ use Illuminate\View\View;
class AuthController extends Controller {
use HttpResponses;
- public function create(): View {
- return view('auth.login');
- }
-
- public function generate(): View {
- return view('auth.register');
- }
-
/**
* Attempt to authenticate the request's credentials_me.
*/
public function login(UserLoginRequest $request) {
$validated = $request->validated();
+
if (! Auth::attempt($request->only('email', 'password'), $request['remember'])) {
- return $this->invalidCredentialsResponse($request);
+ return $this->invalidCredentialsResponse();
}
- $user = User::where('email', $validated['email'])->first();
- $token = $user->createToken('API token for ' . $user->name)->plainTextToken;
-
- if ($request->expectsJson()) {
- return $this->success([
- 'user' => $user,
- 'token' => $token,
- ]);
- }
+ $user = User::where('email', $validated['email'])->first(); // Should remove
+ $token = $user->createToken('API token for ' . $user->name)->plainTextToken; // Should remove
$request->session()->regenerate();
- return redirect()->intended();
+ return response()->json([
+ 'user' => new UserResource(Auth::user()),
+ 'token' => $token, // Should remove
+ ]);
}
public function register(UserStoreRequest $request) {
@@ -92,14 +82,9 @@ class AuthController extends Controller {
return $this->success($request->session()->token(), 'Log out successful.');
}
- private function invalidCredentialsResponse(Request $request) {
- $message = 'Invalid credentials.';
- if ($request->expectsJson()) {
- return response()->json([
- 'errors' => ['email' => [$message]],
- ], 422);
- }
-
- return view('auth.login', ['error' => $message]);
+ private function invalidCredentialsResponse() {
+ return response()->json([
+ 'errors' => ['email' => ['Invalid credentials.']],
+ ], 422);
}
}
diff --git a/app/Http/Controllers/Api/V1/SessionController.php b/app/Http/Controllers/Api/V1/SessionController.php
index 52656c96..2f1ab5ae 100644
--- a/app/Http/Controllers/Api/V1/SessionController.php
+++ b/app/Http/Controllers/Api/V1/SessionController.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Session;
class SessionController extends Controller {
public function index(Request $request) {
@@ -30,14 +31,23 @@ class SessionController extends Controller {
}
public function destroyOthers(Request $request) {
- $validated = $request->validate([
+ $request->validate([
'password' => ['required', 'current_password'],
]);
$user = $request->user();
- $user->forceFill([
- 'password' => Hash::make($validated['password']),
- ])->save();
+
+ DB::table('sessions')
+ ->where('user_id', $request->user()->id)
+ ->delete();
+
+ Auth::guard('web')->logout();
+ $request->session()->invalidate();
+ $request->session()->regenerateToken();
+
+ Auth::guard('web')->login($user);
+ $request->session()->regenerate();
+
// This is not compatible with Sanctum or something -> Auth::logoutOtherDevices($validated['password']);
return response()->noContent();
diff --git a/resources/js/app.ts b/resources/js/app.ts
index 9cd51034..e14cb34b 100644
--- a/resources/js/app.ts
+++ b/resources/js/app.ts
@@ -1,9 +1,9 @@
import './bootstrap';
import { VueQueryPlugin } from '@tanstack/vue-query';
+import { queryClient } from '@/service/vue-query';
import { createPinia } from 'pinia';
import { createApp } from 'vue';
-
import nProgress from 'nprogress';
import router from './router/index';
import App from './App.vue';
@@ -16,5 +16,6 @@ const pinia = createPinia();
application.use(router);
application.use(pinia);
-application.use(VueQueryPlugin);
+application.use(VueQueryPlugin, { queryClient });
+
application.mount('#app');
diff --git a/resources/js/components/settings/account/SettingsSessions.vue b/resources/js/components/settings/account/SettingsSessions.vue
index 330c77af..aff94368 100644
--- a/resources/js/components/settings/account/SettingsSessions.vue
+++ b/resources/js/components/settings/account/SettingsSessions.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import { signOutOtherSessions } from '@/service/authAPI';
import { useSettingsStore } from '@/stores/SettingsStore';
import { storeToRefs } from 'pinia';
@@ -9,8 +10,6 @@ import ButtonForm from '@/components/inputs/ButtonForm.vue';
import SvgSpinners90RingWithBg from '~icons/svg-spinners/90-ring-with-bg';
-import { signOutOtherSessions } from '@/service/authAPI';
-
import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
import useModal from '@/composables/useModal';
diff --git a/resources/js/service/authAPI.ts b/resources/js/service/authAPI.ts
index c0a8747d..2a635672 100644
--- a/resources/js/service/authAPI.ts
+++ b/resources/js/service/authAPI.ts
@@ -1,16 +1,17 @@
import type { ChangeEmailRequest, ChangePasswordRequest, PasswordRequest } from '@/types/requests';
+import { useQueryClient } from '@tanstack/vue-query';
+import { queryClient } from '@/service/vue-query';
import { WEB, API } from '@/service/api';
export const getCSRF = async () => {
return WEB.get(`/sanctum/csrf-cookie`);
};
-export const login = async (credentials: any) => {
+export const login = async (credentials: { email: string; password: string; remember: boolean }) => {
try {
await WEB.get(`/sanctum/csrf-cookie`);
- const response = await API.post('/login', credentials);
- return Promise.resolve(response);
+ return API.post('/login', credentials);
} catch (error) {
throw error instanceof Error ? error : new Error(String(error));
}
@@ -67,10 +68,25 @@ export function getSessions() {
return API.get('/settings/sessions');
}
-export function signOutOtherSessions(data: PasswordRequest) {
- return API.delete('/settings/sessions', {
- data,
- });
+export async function signOutOtherSessions(data: PasswordRequest) {
+ const response = await API.delete('/settings/sessions', { data });
+
+ await queryClient.invalidateQueries({ queryKey: ['sessions'] });
+
+ return response;
+}
+
+export function useSignOutOtherSessions() {
+ const queryClient = useQueryClient();
+
+ return async function signOutOtherSessions(data: PasswordRequest) {
+ const response = await API.delete('/settings/sessions', { data });
+
+ // Manually invalidate the query cache after the request
+ await queryClient.invalidateQueries({ queryKey: ['sessions'] });
+
+ return response;
+ };
}
export function deleteAccount(data: PasswordRequest) {
diff --git a/resources/js/service/vue-query.ts b/resources/js/service/vue-query.ts
new file mode 100644
index 00000000..5e6f978e
--- /dev/null
+++ b/resources/js/service/vue-query.ts
@@ -0,0 +1,3 @@
+import { QueryClient } from '@tanstack/vue-query';
+
+export const queryClient = new QueryClient();