marco/yt-dlp-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code refactoring, fixed wrong jwt expire time

Browse Source
This commit is contained in:
marcobaobao
2023-06-23 15:18:40 +02:00
parent 7d510fd2d4
commit 3067cee08c
5 changed files with 151 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/features/settings/settingsSlice.ts
View File

@@ -1,6 +1,15 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit" import { createSlice, PayloadAction } from "@reduxjs/toolkit"
export type LanguageUnion = "english" | "chinese" | "russian" | "italian" | "spanish" | "korean" | "japanese" | "catalan" export type LanguageUnion =
| "english"
| "chinese"
| "russian"
| "italian"
| "spanish"
| "korean"
| "japanese"
| "catalan"
export type ThemeUnion = "light" | "dark" export type ThemeUnion = "light" | "dark"
export interface SettingsState { export interface SettingsState {

2
frontend/src/utils.ts
View File

@@ -95,7 +95,7 @@ export function formatGiB(bytes: number) {
export const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB` export const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB`
export const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s` export const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s`
export const dateTimeComparatorFunc = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime() export const datetimeCompareFunc = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime()
export function isRPCResponse(object: any): object is RPCResponse<any> { export function isRPCResponse(object: any): object is RPCResponse<any> {
return 'result' in object && 'id' in object return 'result' in object && 'id' in object

4
frontend/src/views/Home.tsx
View File

@@ -24,7 +24,7 @@ import { I18nContext } from '../providers/i18nProvider'
import { RPCClientContext } from '../providers/rpcClientProvider' import { RPCClientContext } from '../providers/rpcClientProvider'
import { RootState } from '../stores/store' import { RootState } from '../stores/store'
import type { RPCResponse, RPCResult } from '../types' import type { RPCResponse, RPCResult } from '../types'
import { dateTimeComparatorFunc, isRPCResponse } from '../utils' import { datetimeCompareFunc, isRPCResponse } from '../utils'
export default function Home() { export default function Home() {
// redux state // redux state
@@ -87,7 +87,7 @@ export default function Home() {
setActiveDownloads((event.result ?? []) setActiveDownloads((event.result ?? [])
.filter(f => !!f.info.url) .filter(f => !!f.info.url)
.sort((a, b) => dateTimeComparatorFunc( .sort((a, b) => datetimeCompareFunc(
b.info.created_at, b.info.created_at,
a.info.created_at, a.info.created_at,
))) )))

6
server/rest/handlers.go
View File

@@ -160,8 +160,10 @@ func Login(ctx *fiber.Ctx) error {
return ctx.SendStatus(fiber.StatusBadRequest) return ctx.SendStatus(fiber.StatusBadRequest)
} }
expiresAt := time.Now().Add(time.Hour * 24 * 30)
token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{ token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
"expiresAt": time.Now().Add(time.Minute * 30), "expiresAt": expiresAt,
}) })
tokenString, err := token.SignedString([]byte(os.Getenv("JWT_SECRET"))) tokenString, err := token.SignedString([]byte(os.Getenv("JWT_SECRET")))
@@ -173,7 +175,7 @@ func Login(ctx *fiber.Ctx) error {
Name: TOKEN_COOKIE_NAME, Name: TOKEN_COOKIE_NAME,
HTTPOnly: true, HTTPOnly: true,
Secure: false, Secure: false,
Expires: time.Now().Add(time.Hour * 24 * 30), // 30 days Expires: expiresAt, // 30 days
Value: tokenString, Value: tokenString,
Path: "/", Path: "/",
}) })