watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 07:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated redis calls.

Browse source
This commit is contained in:
Mike Cao 2023-11-27 20:47:35 -08:00
parent 4c0beaee14
commit f7dd0464e0
9 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/middleware.ts
View file

@ -1,6 +1,6 @@
import redis from '@umami/redis-client';
import cors from 'cors';
import debug from 'debug';
import redis from '@umami/redis-client';
import { getAuthToken, parseShareToken } from 'lib/auth';
import { ROLES } from 'lib/constants';
import { isUuid, secret } from 'lib/crypto';
@ -47,15 +47,17 @@ export const useSession = createMiddleware(async (req, res, next) => {
export const useAuth = createMiddleware(async (req, res, next) => {
const token = getAuthToken(req);
const payload = parseSecureToken(token, secret());
const shareToken = await parseShareToken(req);
const shareToken = await parseShareToken(req as any);
let user = null;
const { userId, authKey, grant } = payload || {};
if (isUuid(userId)) {
user = await getUserById(userId);
} else if (redis && authKey) {
user = await redis.get(authKey);
} else if (redis.enabled && authKey) {
const key = await redis.client.get(authKey);
user = await getUserById(key.userId);
}
if (process.env.NODE_ENV === 'development') {