awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 05:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated use of environment variables to utilize await

Browse Source
This commit is contained in:
Sheen Capadngan
2023-04-27 02:00:16 +08:00
parent 69472514af
commit 2dd1570200
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/v3/authController.ts
+6 -5
View File
@@ -50,8 +50,9 @@ export const login1 = async (req: Request, res: Response) => {
let userId = ''; let userId = '';
if (providerAuthToken) { if (providerAuthToken) {
const decodedToken = <jwt.ProviderAuthJwtPayload>( const decodedToken = <jwt.ProviderAuthJwtPayload>(
jwt.verify(providerAuthToken, getJwtProviderAuthSecret()) jwt.verify(providerAuthToken, await getJwtProviderAuthSecret())
); );
userId = decodedToken.userId; userId = decodedToken.userId;
} }
@@ -118,7 +119,7 @@ export const login2 = async (req: Request, res: Response) => {
let userId = ''; let userId = '';
if (providerAuthToken) { if (providerAuthToken) {
const decodedToken = <jwt.ProviderAuthJwtPayload>( const decodedToken = <jwt.ProviderAuthJwtPayload>(
jwt.verify(providerAuthToken, getJwtProviderAuthSecret()) jwt.verify(providerAuthToken, await getJwtProviderAuthSecret())
); );
userId = decodedToken.userId; userId = decodedToken.userId;
} }
@@ -166,8 +167,8 @@ export const login2 = async (req: Request, res: Response) => {
payload: { payload: {
userId: user._id.toString() userId: user._id.toString()
}, },
expiresIn: getJwtMfaLifetime(), expiresIn: await getJwtMfaLifetime(),
secret: getJwtMfaSecret() secret: await getJwtMfaSecret()
}); });
const code = await TokenService.createToken({ const code = await TokenService.createToken({
@@ -205,7 +206,7 @@ export const login2 = async (req: Request, res: Response) => {
httpOnly: true, httpOnly: true,
path: '/', path: '/',
sameSite: 'strict', sameSite: 'strict',
secure: getHttpsEnabled() secure: await getHttpsEnabled()
}); });
// case: user does not have MFA enablgged // case: user does not have MFA enablgged
backend/src/index.ts
+1 -1
View File
@@ -107,7 +107,7 @@ const main = async () => {
app.use(requestIp.mw()); app.use(requestIp.mw());
app.use(session({ app.use(session({
secret: getSessionSecret(), secret: await getSessionSecret(),
resave: false, // don't save session if unmodified resave: false, // don't save session if unmodified
saveUninitialized: false, // don't create session until something stored saveUninitialized: false, // don't create session until something stored
})); }));
backend/src/routes/v1/auth.ts
+2 -2
View File
@@ -38,8 +38,8 @@ passport.use(new GoogleStrategy({
userId: user._id.toString(), userId: user._id.toString(),
email: user.email, email: user.email,
}, },
expiresIn: getJwtProviderAuthLifetime(), expiresIn: await getJwtProviderAuthLifetime(),
secret: getJwtProviderAuthSecret(), secret: await getJwtProviderAuthSecret(),
}); });
req.providerAuthToken = providerAuthToken; req.providerAuthToken = providerAuthToken;