From 2736974f0791406035a8d8888f2ef65d325b3247 Mon Sep 17 00:00:00 2001
From: Kyle Baran <kbaran@bitscoop.com>
Date: Fri, 21 Jul 2023 14:24:28 -0700
Subject: [PATCH] S3 getSignedUrl now returns 'key' instead of 'Key'

Updated all storage providers to match this.
---
 packages/engine/src/ecs/functions/ComponentFunctions.ts       | 4 ++--
 .../server-core/src/media/storageprovider/ipfs.storage.ts     | 2 +-
 .../server-core/src/media/storageprovider/local.storage.ts    | 4 ++--
 .../server-core/tests/storageprovider/storageprovider.test.ts | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/engine/src/ecs/functions/ComponentFunctions.ts b/packages/engine/src/ecs/functions/ComponentFunctions.ts
index 3ab2d756c4..95f4358126 100755
--- a/packages/engine/src/ecs/functions/ComponentFunctions.ts
+++ b/packages/engine/src/ecs/functions/ComponentFunctions.ts
@@ -27,7 +27,7 @@ import { Subscribable, subscribable } from '@hookstate/subscribable'
 import * as bitECS from 'bitecs'
 // tslint:disable:ordered-imports
 import type from 'react/experimental'
-import React, { startTransition, useEffect, useLayoutEffect } from 'react'
+import React, { startTransition, use, useEffect, useLayoutEffect } from 'react'
 
 import config from '@etherealengine/common/src/config'
 import { DeepReadonly } from '@etherealengine/common/src/DeepReadonly'
@@ -507,7 +507,7 @@ export function useComponent<C extends Component<any>>(entity: Entity, Component
   }
 
   // use() will suspend the component (by throwing a promise) and resume when the promise is resolved
-  _use(promiseResolver.promise)
+  ;(use ?? _use)(promiseResolver.promise)
 
   return useHookstate(Component.stateMap[entity]) as any as State<ComponentType<C>> // todo fix any cast
 }
diff --git a/packages/server-core/src/media/storageprovider/ipfs.storage.ts b/packages/server-core/src/media/storageprovider/ipfs.storage.ts
index 4235536045..51aa491a3e 100755
--- a/packages/server-core/src/media/storageprovider/ipfs.storage.ts
+++ b/packages/server-core/src/media/storageprovider/ipfs.storage.ts
@@ -132,7 +132,7 @@ export class IPFSStorage implements StorageProviderInterface {
   async getSignedUrl(key: string, _expiresAfter: number, _conditions: any) {
     const url = await this._getUrl(key)
     return {
-      fields: { Key: key },
+      fields: { key: key },
       url,
       local: false,
       cacheDomain: this.cacheDomain
diff --git a/packages/server-core/src/media/storageprovider/local.storage.ts b/packages/server-core/src/media/storageprovider/local.storage.ts
index fa6386f4a7..266c4468a3 100755
--- a/packages/server-core/src/media/storageprovider/local.storage.ts
+++ b/packages/server-core/src/media/storageprovider/local.storage.ts
@@ -222,7 +222,7 @@ export class LocalStorage implements StorageProviderInterface {
    */
   getSignedUrl = (key: string, _expiresAfter: number, _conditions): any => {
     return {
-      fields: { Key: key },
+      fields: { key: key },
       url: `https://${this.cacheDomain}`,
       local: true,
       cacheDomain: this.cacheDomain
@@ -306,7 +306,7 @@ export class LocalStorage implements StorageProviderInterface {
       res.type = path.extname(res.key).substring(1) // remove '.' from extension
       res.name = path.basename(res.key, '.' + res.type)
       res.size = this._formatBytes(fs.lstatSync(pathString).size)
-      res.url = signedUrl.url + path.sep + signedUrl.fields.Key
+      res.url = signedUrl.url + path.sep + signedUrl.fields.key
     }
 
     return res
diff --git a/packages/server-core/tests/storageprovider/storageprovider.test.ts b/packages/server-core/tests/storageprovider/storageprovider.test.ts
index 2db472a1d0..7d72f21398 100644
--- a/packages/server-core/tests/storageprovider/storageprovider.test.ts
+++ b/packages/server-core/tests/storageprovider/storageprovider.test.ts
@@ -102,7 +102,7 @@ describe('storageprovider', () => {
       })
       let res
       try {
-        res = await fetch(signedUrl.url + signedUrl.fields.Key, { agent: httpAgent })
+        res = await fetch(signedUrl.url + signedUrl.fields.key, { agent: httpAgent })
       } catch (err) {
         console.log(err)
       }