watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 05:37:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updated redis logic.

Browse source
This commit is contained in:
Mike Cao 2025-02-10 21:07:18 -08:00
parent 39e7ceac06
commit 4d6ec631f7
9 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/lib/auth.ts
View file

@ -1,6 +1,6 @@
import bcrypt from 'bcryptjs';
import { Report } from '@prisma/client';
import { getClient, redisEnabled } from '@umami/redis-client';
import redis from '@/lib/redis';
import debug from 'debug';
import { PERMISSIONS, ROLE_PERMISSIONS, ROLES, SHARE_TOKEN_HEADER } from '@/lib/constants';
import { secret, getRandomChars } from '@/lib/crypto';
@ -31,10 +31,8 @@ export async function checkAuth(request: Request) {
if (userId) {
user = await getUser(userId);
} else if (redisEnabled && authKey) {
const redis = getClient();
const key = await redis.get(authKey);
} else if (redis.enabled && authKey) {
const key = await redis.client.get(authKey);
if (key?.userId) {
user = await getUser(key.userId);
@ -66,12 +64,12 @@ export async function checkAuth(request: Request) {
export async function saveAuth(data: any, expire = 0) {
const authKey = `auth:${getRandomChars(32)}`;
const redis = getClient();
if (redis.enabled) {
await redis.client.set(authKey, data);
await redis.set(authKey, data);
if (expire) {
await redis.expire(authKey, expire);
if (expire) {
await redis.client.expire(authKey, expire);
}
}
return createSecureToken({ authKey }, secret());