Remove uploader scopes (#1776)

CHANGELOG.md

@@ -12,7 +12,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Cloud config
 
 - `deploymentId` and `encryptedDeploymentId` removed from **uploadAdapter** options
-- `scope` added to **uploadAdapter** options
 
 ### Added
 

examples/cli-uploader/config.cloud.js

@@ -46,7 +46,6 @@ export default {
     options: {
       CDN: declareRuntimeEnv('RESOLVE_UPLOADER_URL'),
       uploaderArn: declareRuntimeEnv('RESOLVE_UPLOADER_LAMBDA_ARN'),
-      scope: 'cli-uploader',
     },
   },
 }

examples/image-gallery/config.cloud.js

@@ -35,7 +35,6 @@ export default {
     options: {
       CDN: declareRuntimeEnv('RESOLVE_UPLOADER_URL'),
       uploaderArn: declareRuntimeEnv('RESOLVE_UPLOADER_LAMBDA_ARN'),
-      scope: 'image-gallery',
     },
   },
 }

examples/personal-data/config.cloud.js

@@ -33,7 +33,6 @@ const cloudConfig = {
     options: {
       CDN: declareRuntimeEnv('RESOLVE_UPLOADER_URL'),
       uploaderArn: declareRuntimeEnv('RESOLVE_UPLOADER_LAMBDA_ARN'),
-      scope: 'personal-data',
     },
   },
 }

packages/runtime/runtime/src/cloud/init-uploader.js

@@ -6,7 +6,7 @@ import crypto from 'crypto'
 import mime from 'mime-types'
 
 const createPresignedPut = async (
-  { uploaderArn, userId, encryptedUserId, scope },
+  { uploaderArn, userId, encryptedUserId },
   dir
 ) => {
   const lambda = new Lambda()
@@ -18,7 +18,6 @@ const createPresignedPut = async (
         type: 'put',
         userId,
         encryptedUserId,
-        scope,
         dir,
       }),
     })
@@ -60,7 +59,7 @@ export const upload = (pool, uploadUrl, filePath) => {
 }
 
 const createPresignedPost = async (
-  { uploaderArn, userId, encryptedUserId, scope },
+  { uploaderArn, userId, encryptedUserId },
   dir
 ) => {
   const lambda = new Lambda()
@@ -72,7 +71,6 @@ const createPresignedPost = async (
         type: 'post',
         userId,
         encryptedUserId,
-        scope,
         dir,
       }),
     })
@@ -113,13 +111,12 @@ export const uploadFormData = (pool, form, filePath) => {
 }
 
 export const createToken = (
-  { encryptedUserId, scope },
+  { encryptedUserId },
   { dir, expireTime = 3600 }
 ) => {
   const payload = Buffer.from(
     JSON.stringify({
       encryptedUserId,
-      scope,
       dir,
       expireTime: Date.now() + expireTime * 1000,
     })
@@ -136,7 +133,7 @@ export const createToken = (
 }
 
 const createUploader = (config) => {
-  const { CDN, scope } = config
+  const { CDN } = config
 
   const userId = process.env['RESOLVE_USER_ID']
   const encryptedUserId = process.env['RESOLVE_ENCRYPTED_USER_ID']
@@ -155,7 +152,6 @@ const createUploader = (config) => {
     CDN,
     userId,
     encryptedUserId,
-    scope,
   })
 }
 
@@ -172,7 +168,7 @@ const initUploader = async (resolve) => {
     // TODO: provide support for custom uploader adapter
     const createUploadAdapter = resolve.assemblies.uploadAdapter
     const uploader = createUploader(createUploadAdapter())
-    process.env.RESOLVE_UPLOADER_CDN_URL = `https://${uploader.CDN}/${uploader.userId}/${uploader.scope}`
+    process.env.RESOLVE_UPLOADER_CDN_URL = `https://${uploader.CDN}/${uploader.userId}`
 
     Object.assign(resolve, {
       uploader: {