mirror of
https://github.com/umami-software/umami.git
synced 2025-12-08 05:12:36 +01:00
Refactored redis usage. Added lib/cache.
This commit is contained in:
parent
3485b6268b
commit
f118bc95c1
22 changed files with 236 additions and 221 deletions
|
|
@ -1,23 +1,19 @@
|
|||
import { createMiddleware, unauthorized, badRequest, serverError } from 'next-basics';
|
||||
import { createMiddleware, unauthorized, badRequest } from 'next-basics';
|
||||
import debug from 'debug';
|
||||
import cors from 'cors';
|
||||
import { getSession } from './session';
|
||||
import { parseAuthToken, parseShareToken } from './auth';
|
||||
import { findSession } from 'lib/session';
|
||||
import { parseAuthToken, parseShareToken } from 'lib/auth';
|
||||
import redis from 'lib/redis';
|
||||
|
||||
const log = debug('umami:middleware');
|
||||
|
||||
export const useCors = createMiddleware(cors());
|
||||
|
||||
export const useSession = createMiddleware(async (req, res, next) => {
|
||||
let session;
|
||||
|
||||
try {
|
||||
session = await getSession(req);
|
||||
} catch (e) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error(e);
|
||||
|
||||
return serverError(res, e.message);
|
||||
}
|
||||
const session = await findSession(req);
|
||||
|
||||
if (!session) {
|
||||
log('useSession:session-not-found');
|
||||
return badRequest(res);
|
||||
}
|
||||
|
||||
|
|
@ -29,10 +25,14 @@ export const useAuth = createMiddleware(async (req, res, next) => {
|
|||
const token = await parseAuthToken(req);
|
||||
const shareToken = await parseShareToken(req);
|
||||
|
||||
if (!token && !shareToken) {
|
||||
const key = `auth:${token?.authKey}`;
|
||||
const data = redis.enabled ? await redis.get(key) : token;
|
||||
|
||||
if (!data && !shareToken) {
|
||||
log('useAuth:user-not-authorized');
|
||||
return unauthorized(res);
|
||||
}
|
||||
|
||||
req.auth = { ...token, shareToken };
|
||||
req.auth = { ...data, shareToken };
|
||||
next();
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue