submissions

src/redux/slices/auth.ts

@@ -77,6 +77,22 @@ export const fetchWhoAmI = createAsyncThunk(
   }
 );
 
+// AsyncThunk: Загрузка токенов из localStorage
+export const loadTokensFromLocalStorage = createAsyncThunk(
+  "auth/loadTokens",
+  async (_, { dispatch }) => {
+    const jwt = localStorage.getItem("jwt");
+    const refreshToken = localStorage.getItem("refreshToken");
+
+    if (jwt && refreshToken) {
+      axios.defaults.headers.common['Authorization'] = `Bearer ${jwt}`;
+      return { jwt, refreshToken };
+    } else {
+      return { jwt: null, refreshToken: null };
+    }
+  }
+);
+
 // Slice
 const authSlice = createSlice({
   name: "auth",
@@ -88,6 +104,9 @@ const authSlice = createSlice({
       state.username = null;
       state.status = "idle";
       state.error = null;
+      localStorage.removeItem("jwt");
+      localStorage.removeItem("refreshToken");
+      delete axios.defaults.headers.common['Authorization'];
     },
   },
   extraReducers: (builder) => {
@@ -98,9 +117,11 @@ const authSlice = createSlice({
     });
     builder.addCase(registerUser.fulfilled, (state, action: PayloadAction<{ jwt: string; refreshToken: string }>) => {
       state.status = "successful";
-      axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
       state.jwt = action.payload.jwt;
       state.refreshToken = action.payload.refreshToken;
+      axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
+      localStorage.setItem("jwt", action.payload.jwt);
+      localStorage.setItem("refreshToken", action.payload.refreshToken);
     });
     builder.addCase(registerUser.rejected, (state, action: PayloadAction<any>) => {
       state.status = "failed";
@@ -114,9 +135,11 @@ const authSlice = createSlice({
     });
     builder.addCase(loginUser.fulfilled, (state, action: PayloadAction<{ jwt: string; refreshToken: string }>) => {
       state.status = "successful";
-      axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
       state.jwt = action.payload.jwt;
       state.refreshToken = action.payload.refreshToken;
+      axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
+      localStorage.setItem("jwt", action.payload.jwt);
+      localStorage.setItem("refreshToken", action.payload.refreshToken);
     });
     builder.addCase(loginUser.rejected, (state, action: PayloadAction<any>) => {
       state.status = "failed";
@@ -150,6 +173,15 @@ const authSlice = createSlice({
       state.status = "failed";
       state.error = action.payload;
     });
+
+    // Загрузка токенов из localStorage
+    builder.addCase(loadTokensFromLocalStorage.fulfilled, (state, action: PayloadAction<{ jwt: string | null; refreshToken: string | null }>) => {
+      state.jwt = action.payload.jwt;
+      state.refreshToken = action.payload.refreshToken;
+      if (action.payload.jwt) {
+        axios.defaults.headers.common['Authorization'] = `Bearer ${action.payload.jwt}`;
+      }
+    });
   },
 });