From 59e9b9df1de56e6e5850663da699484ee56478c8 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 15 Nov 2018 12:44:41 +0100 Subject: [PATCH] fixed date format --- src/middleware/dateTimeMiddleware.js | 20 ++++---------------- src/middleware/permissionsMiddleware.js | 4 ++++ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/middleware/dateTimeMiddleware.js b/src/middleware/dateTimeMiddleware.js index 7a83eb58d..b0ab1e539 100644 --- a/src/middleware/dateTimeMiddleware.js +++ b/src/middleware/dateTimeMiddleware.js @@ -3,40 +3,28 @@ import format from 'date-fns/format' export default { Mutation: { CreateUser: async (resolve, root, args, context, info) => { - try { - args.createdAt = format(new Date()) - } catch (err) {} - + args.createdAt = (new Date()).toISOString() args.disabled = false args.deleted = false const result = await resolve(root, args, context, info) return result }, CreatePost: async (resolve, root, args, context, info) => { - try { - args.createdAt = format(new Date()) - } catch (err) {} - + args.createdAt = (new Date()).toISOString() args.disabled = false args.deleted = false const result = await resolve(root, args, context, info) return result }, CreateComment: async (resolve, root, args, context, info) => { - try { - args.createdAt = format(new Date()) - } catch (err) {} - + args.createdAt = (new Date()).toISOString() args.disabled = false args.deleted = false const result = await resolve(root, args, context, info) return result }, CreateOrganization: async (resolve, root, args, context, info) => { - try { - args.createdAt = format(new Date()) - } catch (err) {} - + args.createdAt = (new Date()).toISOString() args.disabled = false args.deleted = false const result = await resolve(root, args, context, info) diff --git a/src/middleware/permissionsMiddleware.js b/src/middleware/permissionsMiddleware.js index 83e1742e9..4956b9b15 100644 --- a/src/middleware/permissionsMiddleware.js +++ b/src/middleware/permissionsMiddleware.js @@ -1,6 +1,7 @@ import { rule, shield, and, or, not, allow } from 'graphql-shield' const isAuthenticated = rule()(async (parent, args, ctx, info) => { + // TODO: how to get this working while seeding? console.log('isSeeding', process.env.IS_SEEDING) if (process.env.IS_SEEDING === true) { return true @@ -8,6 +9,7 @@ const isAuthenticated = rule()(async (parent, args, ctx, info) => { return ctx.user !== null }) const isOwner = rule()(async (parent, args, ctx, info) => { + // TODO: how to get this working while seeding? console.log('isSeeding', process.env.IS_SEEDING) if (process.env.IS_SEEDING === true) { return true @@ -16,6 +18,7 @@ const isOwner = rule()(async (parent, args, ctx, info) => { return ctx.user.id === parent.id }) const isAdmin = rule()(async (parent, args, ctx, info) => { + // TODO: how to get this working while seeding? console.log('isSeeding', process.env.IS_SEEDING) if (process.env.IS_SEEDING === true) { return true @@ -23,6 +26,7 @@ const isAdmin = rule()(async (parent, args, ctx, info) => { return ctx.user.role === 'ADMIN' }) const isModerator = rule()(async (parent, args, ctx, info) => { + // TODO: how to get this working while seeding? console.log('isSeeding', process.env.IS_SEEDING) if (process.env.IS_SEEDING === true) { return true