tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further module conversion

Browse Source
This commit is contained in:
James
2020-11-20 14:34:32 -05:00
parent 1aaed161eb
commit dfc77f0a3f
13 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/auth/default.ts
View File

@@ -11,7 +11,6 @@ const defaultUser = {
tokenExpiration: 7200,
},
fields: [],
timestamps: true,
};
module.exports = defaultUser;
export default defaultUser;

4
src/auth/executeAccess.ts
View File

@@ -1,4 +1,4 @@
const { Forbidden } = require('../errors');
import { Forbidden } from '../errors';
const executeAccess = async (operation, access) => {
if (access) {
@@ -19,4 +19,4 @@ const executeAccess = async (operation, access) => {
return false;
};
module.exports = executeAccess;
export default executeAccess;

6
src/auth/operations/unlock.ts
View File

@@ -1,5 +1,5 @@
const { APIError } = require('../../errors');
const executeAccess = require('../executeAccess');
import { APIError } from '../../errors';
import executeAccess from '../executeAccess';
async function unlock(args) {
if (!Object.prototype.hasOwnProperty.call(args.data, 'email')) {
@@ -40,4 +40,4 @@ async function unlock(args) {
return true;
}
module.exports = unlock;
export default unlock;

6
src/auth/operations/verifyEmail.ts
View File

@@ -1,5 +1,5 @@
const httpStatus = require('http-status');
const { APIError } = require('../../errors');
import httpStatus from 'http-status';
import { APIError } from '../../errors';
async function verifyEmail(args) {
if (!Object.prototype.hasOwnProperty.call(args, 'token')) {
@@ -20,4 +20,4 @@ async function verifyEmail(args) {
return true;
}
module.exports = verifyEmail;
export default verifyEmail;

24
src/collections/operations/create.ts
View File

@@ -1,17 +1,17 @@
const mkdirp = require('mkdirp');
const path = require('path');
const crypto = require('crypto');
import mkdirp from 'mkdirp';
import path from 'path';
import crypto from 'crypto';
const executeAccess = require('../../auth/executeAccess');
const removeInternalFields = require('../../utilities/removeInternalFields');
import executeAccess from '../../auth/executeAccess';
import removeInternalFields from '../../utilities/removeInternalFields';
const { MissingFile, FileUploadError } = require('../../errors');
const resizeAndSave = require('../../uploads/imageResizer');
const getSafeFilename = require('../../uploads/getSafeFilename');
const getImageSize = require('../../uploads/getImageSize');
const imageMIMETypes = require('../../uploads/imageMIMETypes');
import { MissingFile, FileUploadError } from '../../errors';
import resizeAndSave from '../../uploads/imageResizer';
import getSafeFilename from '../../uploads/getSafeFilename';
import getImageSize from '../../uploads/getImageSize';
import imageMIMETypes from '../../uploads/imageMIMETypes';
const sendVerificationEmail = require('../../auth/sendVerificationEmail');
import sendVerificationEmail from '../../auth/sendVerificationEmail';
async function create(incomingArgs) {
const { performFieldOperations, config } = this;
@@ -274,4 +274,4 @@ async function create(incomingArgs) {
return result;
}
module.exports = create;
export default create;

14
src/collections/operations/delete.ts
View File

@@ -1,10 +1,10 @@
const fs = require('fs');
const path = require('path');
import fs from 'fs';
import path from 'path';
const removeInternalFields = require('../../utilities/removeInternalFields');
const { NotFound, Forbidden, ErrorDeletingFile } = require('../../errors');
const executeAccess = require('../../auth/executeAccess');
const fileExists = require('../../uploads/fileExists');
import removeInternalFields from '../../utilities/removeInternalFields';
import { NotFound, Forbidden, ErrorDeletingFile } from '../../errors';
import executeAccess from '../../auth/executeAccess';
import fileExists from '../../uploads/fileExists';
async function deleteQuery(incomingArgs) {
let args = incomingArgs;
@@ -177,4 +177,4 @@ async function deleteQuery(incomingArgs) {
return result;
}
module.exports = deleteQuery;
export default deleteQuery;

6
src/collections/operations/find.ts
View File

@@ -1,5 +1,5 @@
const executeAccess = require('../../auth/executeAccess');
const removeInternalFields = require('../../utilities/removeInternalFields');
import executeAccess from '../../auth/executeAccess';
import removeInternalFields from '../../utilities/removeInternalFields';
async function find(incomingArgs) {
let args = incomingArgs;
@@ -171,4 +171,4 @@ async function find(incomingArgs) {
return result;
}
module.exports = find;
export default find;

10
src/collections/operations/findByID.ts
View File

@@ -1,8 +1,8 @@
/* eslint-disable no-underscore-dangle */
const memoize = require('micro-memoize');
const removeInternalFields = require('../../utilities/removeInternalFields');
const { Forbidden, NotFound } = require('../../errors');
const executeAccess = require('../../auth/executeAccess');
import memoize from 'micro-memoize';
import removeInternalFields from '../../utilities/removeInternalFields';
import { Forbidden, NotFound } from '../../errors';
import executeAccess from '../../auth/executeAccess';
async function findByID(incomingArgs) {
let args = incomingArgs;
@@ -149,4 +149,4 @@ async function findByID(incomingArgs) {
return result;
}
module.exports = findByID;
export default findByID;

24
src/collections/operations/update.ts
View File

@@ -1,16 +1,16 @@
const httpStatus = require('http-status');
const deepmerge = require('deepmerge');
const path = require('path');
import httpStatus from 'http-status';
import deepmerge from 'deepmerge';
import path from 'path';
const removeInternalFields = require('../../utilities/removeInternalFields');
const overwriteMerge = require('../../utilities/overwriteMerge');
const executeAccess = require('../../auth/executeAccess');
const { NotFound, Forbidden, APIError, FileUploadError } = require('../../errors');
const imageMIMETypes = require('../../uploads/imageMIMETypes');
const getImageSize = require('../../uploads/getImageSize');
const getSafeFilename = require('../../uploads/getSafeFilename');
import removeInternalFields from '../../utilities/removeInternalFields';
import overwriteMerge from '../../utilities/overwriteMerge';
import executeAccess from '../../auth/executeAccess';
import { NotFound, Forbidden, APIError, FileUploadError } from '../../errors';
import imageMIMETypes from '../../uploads/imageMIMETypes';
import getImageSize from '../../uploads/getImageSize';
import getSafeFilename from '../../uploads/getSafeFilename';
const resizeAndSave = require('../../uploads/imageResizer');
import resizeAndSave from '../../uploads/imageResizer';
async function update(incomingArgs) {
let args = incomingArgs;
@@ -300,4 +300,4 @@ async function update(incomingArgs) {
return doc;
}
module.exports = update;
export default update;

22
src/collections/sanitize.ts
View File

@@ -1,13 +1,13 @@
const merge = require('deepmerge');
const sanitizeFields = require('../fields/sanitize');
const toKebabCase = require('../utilities/toKebabCase');
const baseAuthFields = require('../fields/baseFields/baseFields');
const baseAPIKeyFields = require('../fields/baseFields/baseAPIKeyFields');
const baseVerificationFields = require('../fields/baseFields/baseVerificationFields');
const baseAccountLockFields = require('../fields/baseFields/baseAccountLockFields');
const baseUploadFields = require('../fields/baseFields/baseUploadFields');
const baseImageUploadFields = require('../fields/baseFields/baseImageUploadFields');
const formatLabels = require('../utilities/formatLabels');
import merge from 'deepmerge';
import sanitizeFields from '../fields/sanitize';
import toKebabCase from '../utilities/toKebabCase';
import baseAuthFields from '../fields/baseFields/baseFields';
import baseAPIKeyFields from '../fields/baseFields/baseAPIKeyFields';
import baseVerificationFields from '../fields/baseFields/baseVerificationFields';
import baseAccountLockFields from '../fields/baseFields/baseAccountLockFields';
import baseUploadFields from '../fields/baseFields/baseUploadFields';
import baseImageUploadFields from '../fields/baseFields/baseImageUploadFields';
import formatLabels from '../utilities/formatLabels';
const mergeBaseFields = (fields, baseFields) => {
const mergedFields = [];
@@ -155,4 +155,4 @@ const sanitizeCollection = (collections, collection) => {
return sanitized;
};
module.exports = sanitizeCollection;
export default sanitizeCollection;

6
src/globals/operations/findOne.ts
View File

@@ -1,5 +1,5 @@
const executeAccess = require('../../auth/executeAccess');
const removeInternalFields = require('../../utilities/removeInternalFields');
import executeAccess from '../../auth/executeAccess';
import removeInternalFields from '../../utilities/removeInternalFields';
async function findOne(args) {
const { globals: { Model } } = this;
@@ -75,4 +75,4 @@ async function findOne(args) {
return doc;
}
module.exports = findOne;
export default findOne;

2
src/utilities/removeInternalFields.ts
View File

@@ -11,4 +11,4 @@ const removeInternalFields = (incomingDoc) => Object.entries(incomingDoc).reduce
};
}, {});
module.exports = removeInternalFields;
export default removeInternalFields;

16
src/utilities/sanitizeConfig.ts
View File

@@ -1,9 +1,9 @@
const defaultUser = require('../auth/default');
const sanitizeCollection = require('../collections/sanitize');
const { InvalidConfiguration } = require('../errors');
const sanitizeGlobals = require('../globals/sanitize');
const validateSchema = require('../schema/validateSchema');
const checkDuplicateCollections = require('./checkDuplicateCollections');
import defaultUser from '../auth/default';
import sanitizeCollection from '../collections/sanitize';
import { InvalidConfiguration } from '../errors';
import sanitizeGlobals from '../globals/sanitize';
import validateSchema from '../schema/validateSchema';
import checkDuplicateCollections from './checkDuplicateCollections';
const sanitizeConfig = (config) => {
const sanitizedConfig = validateSchema({ ...config });
@@ -36,7 +36,7 @@ const sanitizeConfig = (config) => {
if (!sanitizedConfig.admin.user) {
sanitizedConfig.admin.user = 'users';
sanitizedConfig.collections.push(defaultUser);
sanitizedConfig.collections.push(sanitizeCollection(sanitizedConfig.collections, defaultUser));
} else if (!sanitizedConfig.collections.find((c) => c.slug === sanitizedConfig.admin.user)) {
throw new InvalidConfiguration(`${sanitizedConfig.admin.user} is not a valid admin user collection`);
}
@@ -77,4 +77,4 @@ const sanitizeConfig = (config) => {
return sanitizedConfig;
};
module.exports = sanitizeConfig;
export default sanitizeConfig;