Implement token refresh

Author: azrogers

Source/CesiumRuntime/Private/Cesium3DTileset.cpp

@@ -4,15 +4,15 @@
 #include "Async/Async.h"
 #include "Camera/CameraTypes.h"
 #include "Camera/PlayerCameraManager.h"
+#include "Cesium3DTilesSelection/CesiumIonTilesetContentLoaderFactory.h"
 #include "Cesium3DTilesSelection/EllipsoidTilesetLoader.h"
+#include "Cesium3DTilesSelection/IModelMeshExportContentLoaderFactory.h"
+#include "Cesium3DTilesSelection/ITwinCesiumCuratedContentLoaderFactory.h"
+#include "Cesium3DTilesSelection/ITwinRealityDataContentLoaderFactory.h"
 #include "Cesium3DTilesSelection/Tile.h"
 #include "Cesium3DTilesSelection/TilesetLoadFailureDetails.h"
 #include "Cesium3DTilesSelection/TilesetOptions.h"
 #include "Cesium3DTilesSelection/TilesetSharedAssetSystem.h"
-#include "Cesium3DTilesSelection/CesiumIonTilesetContentLoaderFactory.h"
-#include "Cesium3DTilesSelection/IModelMeshExportContentLoaderFactory.h"
-#include "Cesium3DTilesSelection/ITwinCesiumCuratedContentLoaderFactory.h"
-#include "Cesium3DTilesSelection/ITwinRealityDataContentLoaderFactory.h"
 #include "Cesium3DTilesetLoadFailureDetails.h"
 #include "Cesium3DTilesetRoot.h"
 #include "CesiumActors.h"
@@ -473,14 +473,15 @@ void ACesium3DTileset::SetITwinID(const FString& InITwinID) {
   }
 }
 
-void ACesium3DTileset::SetITwinAccessToken(const FString& InAccessToken) {
-  if (this->ITwinAccessToken != InAccessToken) {
+void ACesium3DTileset::SetITwinConnection(
+    UCesiumITwinConnection* InConnection) {
+  if (this->ITwinConnection != InConnection) {
     if (this->TilesetSource == ETilesetSource::FromITwinCesiumCuratedContent ||
         this->TilesetSource == ETilesetSource::FromIModelMeshExportService ||
         this->TilesetSource == ETilesetSource::FromITwinRealityData) {
       this->DestroyTileset();
     }
-    this->ITwinAccessToken = InAccessToken;
+    this->ITwinConnection = InConnection;
   }
 }
 
@@ -1196,7 +1197,9 @@ void ACesium3DTileset::LoadTileset() {
         externals,
         Cesium3DTilesSelection::ITwinCesiumCuratedContentLoaderFactory(
             static_cast<uint32_t>(this->ITwinCesiumContentID),
-            TCHAR_TO_UTF8(*this->ITwinAccessToken)),
+            this->ITwinConnection->GetConnection()
+                ->getAccessToken()
+                .getToken()),
         options);
     break;
   case ETilesetSource::FromIModelMeshExportService:
@@ -1211,7 +1214,9 @@ void ACesium3DTileset::LoadTileset() {
         Cesium3DTilesSelection::IModelMeshExportContentLoaderFactory(
             TCHAR_TO_UTF8(*this->IModelID),
             std::nullopt,
-            TCHAR_TO_UTF8(*this->ITwinAccessToken)),
+            this->ITwinConnection->GetConnection()
+                ->getAccessToken()
+                .getToken()),
         options);
     break;
   case ETilesetSource::FromITwinRealityData:
@@ -1228,9 +1233,33 @@ void ACesium3DTileset::LoadTileset() {
             this->ITwinID.IsEmpty() ? std::nullopt
                                     : std::make_optional<std::string>(
                                           TCHAR_TO_UTF8(*this->ITwinID)),
-            TCHAR_TO_UTF8(*this->ITwinAccessToken),
-            [asyncSystem](const std::string&) {
-              return asyncSystem.createResolvedFuture<CesiumUtility::Result<std::string>>(CesiumUtility::Result<std::string>(std::string{}));
+            this->ITwinConnection->GetConnection()->getAccessToken().getToken(),
+            [asyncSystem, pConnection = this->ITwinConnection->GetConnection()](
+                const std::string&) {
+              if (!pConnection->getRefreshToken()) {
+                return asyncSystem.createResolvedFuture<
+                    CesiumUtility::
+                        Result<std::string>>(CesiumUtility::ErrorList::error(
+                    "Access token for reality data is expired, no refresh token available."));
+              }
+
+              return pConnection->me().thenImmediately(
+                  [pConnection](
+                      CesiumUtility::Result<CesiumITwinClient::UserProfile>&&
+                          result) -> CesiumUtility::Result<std::string> {
+                    if (!result.value) {
+                      return CesiumUtility::Result<std::string>(result.errors);
+                    }
+
+                    if (!pConnection->getAccessToken().isValid()) {
+                      return CesiumUtility::Result<
+                          std::string>(CesiumUtility::ErrorList::error(
+                          "Tried to refresh access token for reality data, but was not able to obtain valid token."));
+                    }
+
+                    return CesiumUtility::Result<std::string>(
+                        pConnection->getAccessToken().getToken());
+                  });
             }),
         options);
     break;
@@ -2346,7 +2375,7 @@ void ACesium3DTileset::PostEditChangeProperty(
       PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, IModelID) ||
       PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, RealityDataID) ||
       PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, ITwinID) ||
-      PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, ITwinAccessToken) ||
+      PropName == GET_MEMBER_NAME_CHECKED(ACesium3DTileset, ITwinConnection) ||
       PropName ==
           GET_MEMBER_NAME_CHECKED(ACesium3DTileset, CreatePhysicsMeshes) ||
       PropName ==

Source/CesiumRuntime/Public/Cesium3DTileset.h

@@ -10,6 +10,7 @@
 #include "CesiumEncodedMetadataComponent.h"
 #include "CesiumFeaturesMetadataComponent.h"
 #include "CesiumGeoreference.h"
+#include "CesiumITwinAPIBlueprintLibrary.h"
 #include "CesiumIonServer.h"
 #include "CesiumPointCloudShading.h"
 #include "CesiumSampleHeightResult.h"
@@ -857,13 +858,13 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
    */
   UPROPERTY(
       EditAnywhere,
-      BlueprintGetter = GetITwinAccessToken,
-      BlueprintSetter = SetITwinAccessToken,
+      BlueprintGetter = GetITwinConnection,
+      BlueprintSetter = SetITwinConnection,
       Category = "Cesium",
       meta =
           (EditCondition =
                "TilesetSource==ETilesetSource::FromITwinCesiumCuratedContent || TilesetSource==ETilesetSource::FromIModelMeshExportService || TilesetSource==ETilesetSource::FromITwinRealityData"))
-  FString ITwinAccessToken;
+  UCesiumITwinConnection* ITwinConnection;
 
   /**
    * Headers to be attached to each request made for this tileset.
@@ -1164,10 +1165,12 @@ class CESIUMRUNTIME_API ACesium3DTileset : public AActor {
   void SetITwinID(const FString& InITwinID);
 
   UFUNCTION(BlueprintGetter, Category = "Cesium")
-  FString GetITwinAccessToken() const { return ITwinAccessToken; }
+  UCesiumITwinConnection* GetITwinAccessToken() const {
+    return ITwinConnection;
+  }
 
   UFUNCTION(BlueprintSetter, Category = "Cesium")
-  void SetITwinAccessToken(const FString& InAccessToken);
+  void SetITwinConnection(UCesiumITwinConnection* InAccessToken);
 
   UFUNCTION(BlueprintGetter, Category = "VirtualTexture")
   TArray<URuntimeVirtualTexture*> GetRuntimeVirtualTextures() const {

Source/CesiumRuntime/Public/CesiumITwinAPIBlueprintLibrary.h

@@ -61,6 +61,16 @@ class UCesiumITwinConnection : public UObject {
   UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Cesium|iTwin")
   bool IsValid() { return this->pConnection != nullptr; }
 
+  UFUNCTION(BlueprintCallable, BlueprintPure, Category = "Cesium|iTwin")
+  FString GetAccessToken() {
+    return UTF8_TO_TCHAR(
+        this->pConnection->getAccessToken().getToken().c_str());
+  }
+
+  TSharedPtr<CesiumITwinClient::Connection>& GetConnection() {
+    return this->pConnection;
+  }
+
   void SetConnection(TSharedPtr<CesiumITwinClient::Connection> pConnection) {
     this->pConnection = pConnection;
   }