github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use centralized env export with validator function

Browse Source
This commit is contained in:
rijkvanzanten
2020-08-04 13:10:49 -04:00
parent 260b66f57c
commit 2252d5a35f
18 changed files with 131 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/routes/auth.ts
View File

@@ -9,6 +9,7 @@ import getEmailFromProfile from '../utils/get-email-from-profile';
import { InvalidPayloadException } from '../exceptions/invalid-payload';
import ms from 'ms';
import cookieParser from 'cookie-parser';
import env from '../env';
const router = Router();
@@ -61,11 +62,10 @@ router.post(
if (mode === 'cookie') {
res.cookie('directus_refresh_token', refreshToken, {
httpOnly: true,
maxAge: ms(process.env.REFRESH_TOKEN_TTL as string),
secure: process.env.REFRESH_TOKEN_COOKIE_SECURE === 'true' ? true : false,
maxAge: ms(env.REFRESH_TOKEN_TTL as string),
secure: env.REFRESH_TOKEN_COOKIE_SECURE === 'true' ? true : false,
sameSite:
(process.env.REFRESH_TOKEN_COOKIE_SAME_SITE as 'lax' | 'strict' | 'none') ||
'strict',
(env.REFRESH_TOKEN_COOKIE_SAME_SITE as 'lax' | 'strict' | 'none') || 'strict',
});
}
@@ -112,11 +112,10 @@ router.post(
if (mode === 'cookie') {
res.cookie('directus_refresh_token', refreshToken, {
httpOnly: true,
maxAge: ms(process.env.REFRESH_TOKEN_TTL as string),
secure: process.env.REFRESH_TOKEN_COOKIE_SECURE === 'true' ? true : false,
maxAge: ms(env.REFRESH_TOKEN_TTL as string),
secure: env.REFRESH_TOKEN_COOKIE_SECURE === 'true' ? true : false,
sameSite:
(process.env.REFRESH_TOKEN_COOKIE_SAME_SITE as 'lax' | 'strict' | 'none') ||
'strict',
(env.REFRESH_TOKEN_COOKIE_SAME_SITE as 'lax' | 'strict' | 'none') || 'strict',
});
}
@@ -154,7 +153,7 @@ router.post(
router.use(
'/sso',
session({ secret: process.env.SECRET as string, saveUninitialized: false, resave: false })
session({ secret: env.SECRET as string, saveUninitialized: false, resave: false })
);
router.use(grant.express()(getGrantConfig()));

3
api/src/routes/files.ts
View File

@@ -7,6 +7,7 @@ import useCollection from '../middleware/use-collection';
import { Item } from '../types';
import path from 'path';
import formatTitle from '@directus/format-title';
import env from '../env';
const router = express.Router();
@@ -23,7 +24,7 @@ const multipartHandler = (operation: 'create' | 'update') =>
* the row in directus_files async during the upload of the actual file.
*/
let disk: string = (process.env.STORAGE_LOCATIONS as string).split(',')[0].trim();
let disk: string = (env.STORAGE_LOCATIONS as string).split(',')[0].trim();
let payload: Partial<Item> = {};
let fileCount = 0;