From d9f7aa5a75ba2dde8a2a28e2fc8de2c51f4a4fd1 Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Sat, 28 Aug 2021 16:30:50 -0400 Subject: [PATCH] updated util.uploadCDNAsset --- src/models/pnid.js | 8 ++++---- src/util.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/models/pnid.js b/src/models/pnid.js index 8e05d5d..61dd0ea 100644 --- a/src/models/pnid.js +++ b/src/models/pnid.js @@ -215,19 +215,19 @@ PNIDSchema.methods.generateMiiImages = async function() { const userMiiKey = `mii/${this.get('pid')}`; - await util.uploadCDNAsset(`${userMiiKey}/standard.tga`, tga); - await util.uploadCDNAsset(`${userMiiKey}/normal_face.png`, miiStudioNormalFaceImageData); + await util.uploadCDNAsset('pn-cdn', `${userMiiKey}/standard.tga`, tga, 'public-read'); + await util.uploadCDNAsset('pn-cdn', `${userMiiKey}/normal_face.png`, miiStudioNormalFaceImageData, 'public-read'); const expressions = ['frustrated', 'smile_open_mouth', 'wink_left', 'sorrow', 'surprise_open_mouth']; for (const expression of expressions) { const miiStudioExpressionUrl = `https://studio.mii.nintendo.com/miis/image.png?data=${encodedStudioMiiData}&type=face&expression=${expression}&width=128&instanceCount=1`; const miiStudioExpressionImageData = await got(miiStudioExpressionUrl).buffer(); - await util.uploadCDNAsset(`${userMiiKey}/${expression}.png`, miiStudioExpressionImageData); + await util.uploadCDNAsset('pn-cdn', `${userMiiKey}/${expression}.png`, miiStudioExpressionImageData, 'public-read'); } const miiStudioBodyUrl = `https://studio.mii.nintendo.com/miis/image.png?data=${encodedStudioMiiData}&type=all_body&width=270&instanceCount=1`; const miiStudioBodyImageData = await got(miiStudioBodyUrl).buffer(); - await util.uploadCDNAsset(`${userMiiKey}/body.png`, miiStudioBodyImageData); + await util.uploadCDNAsset('pn-cdn', `${userMiiKey}/body.png`, miiStudioBodyImageData, 'public-read'); }; PNIDSchema.pre('save', async function(next) { diff --git a/src/util.js b/src/util.js index 9b069e2..83c3f22 100644 --- a/src/util.js +++ b/src/util.js @@ -176,12 +176,12 @@ function fullUrl(request) { return `${protocol}://${host}${path}`; } -async function uploadCDNAsset(key, data) { +async function uploadCDNAsset(bucket, key, data, acl) { const awsPutParams = { Body: data, Key: key, - Bucket: 'pn-cdn', - ACL: 'public-read' + Bucket: bucket, + ACL: acl }; await s3.putObject(awsPutParams).promise();