coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: uuid import broken by dep bump 🤦‍♂️

Browse Source
This commit is contained in:
Tom Moor
2021-04-25 12:54:06 -07:00
parent 2d22399bbc
commit 6de793e94e
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/commands/attachmentCreator.js
View File

@ -1,5 +1,5 @@
// @flow
import uuid from "uuid";
import { v4 as uuidv4 } from "uuid";
import { Attachment, Event, User } from "../models";
import { uploadToS3FromBuffer } from "../utils/s3";
@ -18,7 +18,7 @@ export default async function attachmentCreator({
source?: "import",
ip: string,
}) {
const key = `uploads/${user.id}/${uuid.v4()}/${name}`;
const key = `uploads/${user.id}/${uuidv4()}/${name}`;
const acl = process.env.AWS_S3_ACL || "private";
const url = await uploadToS3FromBuffer(buffer, type, key, acl);

4
server/commands/collectionImporter.js
View File

@ -6,7 +6,7 @@ import debug from "debug";
import File from "formidable/lib/file";
import invariant from "invariant";
import { values, keys } from "lodash";
import uuid from "uuid";
import { v4 as uuidv4 } from "uuid";
import { parseOutlineExport } from "../../shared/utils/zip";
import { FileImportError } from "../errors";
import { Attachment, Event, Document, Collection, User } from "../models";
@ -96,7 +96,7 @@ export default async function collectionImporter({
const content = await item.item.async("string");
const name = path.basename(item.name);
const tmpDir = os.tmpdir();
const tmpFilePath = `${tmpDir}/upload-${uuid.v4()}`;
const tmpFilePath = `${tmpDir}/upload-${uuidv4()}`;
await fs.promises.writeFile(tmpFilePath, content);
const file = new File({