From 761959ff7eadd65108477138b3bf69f0ebf992da Mon Sep 17 00:00:00 2001 From: Saumya Pandey Date: Fri, 4 Jun 2021 15:11:57 +0530 Subject: [PATCH] Revert "Use more specifics format functions" This reverts commit 43d100240208b098dafd0bdea76f122133b8be76. --- app/components/DocumentHistory/components/Revision.js | 4 ++-- app/components/LocaleTime.js | 4 ++-- server/api/attachments.js | 4 ++-- server/utils/s3.js | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/components/DocumentHistory/components/Revision.js b/app/components/DocumentHistory/components/Revision.js index 3e1f0f57f3..f1469f89b0 100644 --- a/app/components/DocumentHistory/components/Revision.js +++ b/app/components/DocumentHistory/components/Revision.js @@ -1,5 +1,5 @@ // @flow -import { formatRFC7231 } from "date-fns"; +import { format } from "date-fns"; import * as React from "react"; import { NavLink } from "react-router-dom"; import styled, { withTheme } from "styled-components"; @@ -37,7 +37,7 @@ class RevisionListItem extends React.Component { {showMenu && ( diff --git a/app/components/LocaleTime.js b/app/components/LocaleTime.js index 7d10c225d7..6996bd5806 100644 --- a/app/components/LocaleTime.js +++ b/app/components/LocaleTime.js @@ -1,5 +1,5 @@ // @flow -import { formatRFC7231, formatDistanceToNow } from "date-fns"; +import { format, formatDistanceToNow } from "date-fns"; import * as React from "react"; import Tooltip from "components/Tooltip"; import useUserLocale from "hooks/useUserLocale"; @@ -78,7 +78,7 @@ function LocaleTime({ return ( diff --git a/server/api/attachments.js b/server/api/attachments.js index 27c10fc45f..77143e291c 100644 --- a/server/api/attachments.js +++ b/server/api/attachments.js @@ -1,5 +1,5 @@ // @flow -import { lightFormat } from "date-fns"; +import { format } from "date-fns"; import Router from "koa-router"; import { v4 as uuidv4 } from "uuid"; import { NotFoundError } from "../errors"; @@ -39,7 +39,7 @@ router.post("attachments.create", auth(), async (ctx) => { const bucket = acl === "public-read" ? "public" : "uploads"; const key = `${bucket}/${user.id}/${s3Key}/${name}`; const credential = makeCredential(); - const longDate = lightFormat(new Date(), "yyyyMMdd'T'HHmmss'Z'"); + const longDate = format(new Date(), "yyyyMMdd'T'HHmmss'Z'"); const policy = makePolicy(credential, longDate, acl, contentType); const endpoint = publicS3Endpoint(); const url = `${endpoint}/${key}`; diff --git a/server/utils/s3.js b/server/utils/s3.js index 7558bb0a33..121be2b8e4 100644 --- a/server/utils/s3.js +++ b/server/utils/s3.js @@ -2,7 +2,7 @@ import crypto from "crypto"; import * as Sentry from "@sentry/node"; import AWS from "aws-sdk"; -import { addHours, lightFormat } from "date-fns"; +import { addHours, format } from "date-fns"; import fetch from "fetch-with-proxy"; const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY; @@ -35,7 +35,7 @@ export const makeCredential = () => { const credential = AWS_ACCESS_KEY_ID + "/" + - lightFormat(new Date(), "yyyyMMdd") + + format(new Date(), "yyyyMMdd") + "/" + AWS_REGION + "/s3/aws4_request"; @@ -61,7 +61,7 @@ export const makePolicy = ( { "x-amz-credential": credential }, { "x-amz-date": longDate }, ], - expiration: lightFormat(tomorrow, "yyyy-MM-dd'T'HH:mm:ss'Z'"), + expiration: format(tomorrow, "yyyy-MM-dd'T'HH:mm:ss'Z'"), }; return Buffer.from(JSON.stringify(policy)).toString("base64"); @@ -70,7 +70,7 @@ export const makePolicy = ( export const getSignature = (policy: any) => { const kDate = hmac( "AWS4" + AWS_SECRET_ACCESS_KEY, - lightFormat(new Date(), "yyyyMMdd") + format(new Date(), "yyyyMMdd") ); const kRegion = hmac(kDate, AWS_REGION); const kService = hmac(kRegion, "s3");