From c8f8a96f2a3fcc25a6485a4a8749dcffb55cc13a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2024 14:15:21 +0000
Subject: [PATCH] use tokenProps to upload tiles (backport #7178)
 [release/4.9.x] (#7179)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Paulius Valiūnas <66480813+paulius-valiunas@users.noreply.github.com>
---
 ...se-tokenProps-to-upload-tiles_2024-09-20-13-12.json | 10 ++++++++++
 core/backend/src/rpc-impl/IModelTileRpcImpl.ts         |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 common/changes/@itwin/core-backend/use-tokenProps-to-upload-tiles_2024-09-20-13-12.json

diff --git a/common/changes/@itwin/core-backend/use-tokenProps-to-upload-tiles_2024-09-20-13-12.json b/common/changes/@itwin/core-backend/use-tokenProps-to-upload-tiles_2024-09-20-13-12.json
new file mode 100644
index 000000000000..99b35bb89b62
--- /dev/null
+++ b/common/changes/@itwin/core-backend/use-tokenProps-to-upload-tiles_2024-09-20-13-12.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-backend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-backend"
+}
\ No newline at end of file
diff --git a/core/backend/src/rpc-impl/IModelTileRpcImpl.ts b/core/backend/src/rpc-impl/IModelTileRpcImpl.ts
index fbb656af40ba..9c12b9b7713e 100644
--- a/core/backend/src/rpc-impl/IModelTileRpcImpl.ts
+++ b/core/backend/src/rpc-impl/IModelTileRpcImpl.ts
@@ -140,7 +140,7 @@ async function getTileContent(props: TileContentRequestProps): Promise<TileConte
       tileGenerationTime: tile.elapsedSeconds.toString(),
       tileSize: tile.content.byteLength.toString(),
     };
-    await IModelHost.tileStorage?.uploadTile(db.iModelId, db.changeset.id, props.treeId, props.contentId, tile.content, props.guid, tileMetadata);
+    await IModelHost.tileStorage?.uploadTile(props.tokenProps.iModelId ?? db.iModelId, props.tokenProps.changeset?.id ?? db.changeset.id, props.treeId, props.contentId, tile.content, props.guid, tileMetadata);
     const { accessToken: _, ...safeProps } = props;
     Logger.logInfo(BackendLoggerCategory.IModelTileRequestRpc, "Generated and uploaded tile", { tileMetadata, ...safeProps });