awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-04 04:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed try catch from requireAuth middleware

Browse Source
This commit is contained in:
Sheen Capadngan
2023-05-29 18:14:16 +08:00
parent 7f4db518cc
commit e6027b3c72
1 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/middleware/requireAuth.ts
+46 -50
View File
@@ -45,58 +45,54 @@ const requireAuth = ({
// validate auth token against accepted auth modes [acceptedAuthModes] // validate auth token against accepted auth modes [acceptedAuthModes]
// and return token type [authTokenType] and value [authTokenValue] // and return token type [authTokenType] and value [authTokenValue]
try { const { authMode, authTokenValue } = validateAuthMode({
const { authMode, authTokenValue } = validateAuthMode({ headers: req.headers,
headers: req.headers, acceptedAuthModes
acceptedAuthModes });
});
let authPayload: IUser | IServiceAccount | IServiceTokenData; let authPayload: IUser | IServiceAccount | IServiceTokenData;
switch (authMode) { switch (authMode) {
case AUTH_MODE_SERVICE_ACCOUNT: case AUTH_MODE_SERVICE_ACCOUNT:
authPayload = await getAuthSAAKPayload({ authPayload = await getAuthSAAKPayload({
authTokenValue authTokenValue
}); });
req.serviceAccount = authPayload; req.serviceAccount = authPayload;
break; break;
case AUTH_MODE_SERVICE_TOKEN: case AUTH_MODE_SERVICE_TOKEN:
authPayload = await getAuthSTDPayload({ authPayload = await getAuthSTDPayload({
authTokenValue authTokenValue
}); });
req.serviceTokenData = authPayload; req.serviceTokenData = authPayload;
break; break;
case AUTH_MODE_API_KEY: case AUTH_MODE_API_KEY:
authPayload = await getAuthAPIKeyPayload({ authPayload = await getAuthAPIKeyPayload({
authTokenValue authTokenValue
}); });
req.user = authPayload; req.user = authPayload;
break; break;
default: default:
authPayload = await getAuthUserPayload({ authPayload = await getAuthUserPayload({
authTokenValue authTokenValue
}); });
req.user = authPayload; req.user = authPayload;
break; break;
}
req.requestData = {
...req.params,
...req.query,
...req.body,
}
req.authData = {
authMode,
authPayload, // User, ServiceAccount, ServiceTokenData
authChannel: getChannelFromUserAgent(req.headers['user-agent']),
authIP: req.ip,
authUserAgent: req.headers['user-agent'] ?? 'other'
}
return next();
} catch (err) {
return next(err);
} }
req.requestData = {
...req.params,
...req.query,
...req.body,
}
req.authData = {
authMode,
authPayload, // User, ServiceAccount, ServiceTokenData
authChannel: getChannelFromUserAgent(req.headers['user-agent']),
authIP: req.ip,
authUserAgent: req.headers['user-agent'] ?? 'other'
}
return next();
} }
} }