From 776073650c78a946c4cd2753234baedaf1c7276e Mon Sep 17 00:00:00 2001 From: Dwayne Harris Date: Tue, 15 Oct 2019 02:48:27 -0400 Subject: [PATCH] WIP --- src/lib/utils.ts | 5 +++-- src/plugins/api/uploads.ts | 10 ++++++---- src/plugins/api/users.ts | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 6b4141f..e724996 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -8,9 +8,10 @@ export function trimContent(content?: string, length: number = 128): string { return content.slice(0, length).trim() } -export const createPostId = () => 'p' + v1().replace(/-/g, '') +export const createId = () => v1().replace(/-/g, '') +export const createPostId = () => 'p' + createId() export const createInvitationCode = () => generateString(8) -export const createInstallationId = () => 'i' + v1().replace(/-/g, '') +export const createInstallationId = () => 'i' + createId() export function wait(ms: number = 5000): Promise { return new Promise(resolve => { diff --git a/src/plugins/api/uploads.ts b/src/plugins/api/uploads.ts index f183410..3179a7b 100644 --- a/src/plugins/api/uploads.ts +++ b/src/plugins/api/uploads.ts @@ -11,7 +11,7 @@ import { import { Server, IncomingMessage, ServerResponse } from 'http' import moment from 'moment' import { SharedKeyCredential, ContainerSASPermissions, generateBlobSASQueryParameters } from '@azure/storage-blob' - +import { createId } from '../../lib/utils' import { PluginOptions } from '../../types' function getSASRoute(server: FastifyInstance) { @@ -22,22 +22,24 @@ function getSASRoute(server: FastifyInstance('/api/sas', options, async () => { + server.get('/api/sas', options, async () => { const sharedKeyCredential = new SharedKeyCredential(process.env.BLOB_STORAGE_ACCOUNT!, process.env.BLOB_STORAGE_ACCOUNT_KEY!) return { sas: generateBlobSASQueryParameters({ containerName: process.env.BLOB_STORAGE_CONTAINER!, - permissions: ContainerSASPermissions.parse('ar').toString(), + permissions: ContainerSASPermissions.parse('arcw').toString(), startTime: new Date(), expiryTime: moment().add(5, 'm').toDate(), - }, sharedKeyCredential).toString() + }, sharedKeyCredential).toString(), + id: createId(), } }) } diff --git a/src/plugins/api/users.ts b/src/plugins/api/users.ts index 72c6330..ba47207 100644 --- a/src/plugins/api/users.ts +++ b/src/plugins/api/users.ts @@ -83,6 +83,8 @@ function updateRoute(server: FastifyInstance(viewer) return viewer })