alter exception handling

Author: corybarr

src/core/include/cesium/omniverse/CesiumIonSession.h

@@ -23,7 +23,7 @@ class CesiumIonSession {
         const CesiumAsync::AsyncSystem& asyncSystem,
         std::shared_ptr<CesiumAsync::IAssetAccessor> pAssetAccessor,
         std::string ionServerUrl,
-        /*std::string ionApiUrl,*/
+        std::string ionApiUrl,
         int64_t ionApplicationId);
     ~CesiumIonSession() = default;
     CesiumIonSession(const CesiumIonSession&) = delete;

src/core/src/CesiumIonSession.cpp

@@ -37,11 +37,11 @@ CesiumIonSession::CesiumIonSession(
     , _loadTokensQueued(false)
     , _authorizeUrl()
     , _ionServerUrl(std::move(ionServerUrl))
-    /* , _ionApiUrl(std::move(ionApiUrl)) */
-    , _ionApplicationId(ionApplicationId) {}
+    , _ionApiUrl(std::move(ionApiUrl))
+    , _ionApplicationId(ionApplicationId) {
+    }
 
 void CesiumIonSession::connect() {
-
     if (this->isConnecting() || this->isConnected() || this->isResuming()) {
         return;
     }
@@ -86,7 +86,7 @@ void CesiumIonSession::connect() {
                         this->_authorizeUrl = url;
                     },
                     this->_appData.value(),
-                    _ionServerUrl,
+                    _ionApiUrl,
                     CesiumUtility::Uri::resolve(_ionServerUrl, "oauth"));
             }
 
@@ -97,9 +97,6 @@ void CesiumIonSession::connect() {
             this->_isConnecting = false;
             this->_connection = std::move(connection);
 
-            // TODO: how to update filed in OmniIonServer?
-            // CesiumForUnity::CesiumIonServer server = session.server();
-
             Settings::AccessToken token;
             token.ionApiUrl = _ionApiUrl;
             token.accessToken = this->_connection.value().getAccessToken();
@@ -142,8 +139,6 @@ void CesiumIonSession::resume() {
 
     this->_isResuming = true;
 
-    this->_connection.reset(); //DEBUG
-
     // Verify that the connection actually works.
     this->ensureAppDataLoaded()
         .thenInMainThread([this, accessToken](bool loadedAppData) {
@@ -346,26 +341,20 @@ CesiumAsync::Future<bool> CesiumIonSession::ensureAppDataLoaded() {
     return CesiumIonClient::Connection::appData(
                this->_asyncSystem,
                this->_pAssetAccessor,
-               this->_ionApiUrl) // .ToStlString()?
+               this->_ionApiUrl)
         .thenInMainThread([this](CesiumIonClient::Response<CesiumIonClient::ApplicationData>&& applicationData) {
             CesiumAsync::Promise<bool> promise = this->_asyncSystem.createPromise<bool>();
 
             this->_appData = applicationData.value;
             if (!applicationData.value.has_value()) {
-                //   UnityEngine::Debug::LogError(System::String(fmt::format(
-                //       "Failed to obtain ion server application data: {}",
-                //       applicationData.errorMessage)));
                 promise.resolve(false);
             } else {
                 promise.resolve(true);
             }
 
             return promise.getFuture();
         })
-        .catchInMainThread([this](std::exception&& e) {
-            // logResponseErrors(e);
-            (void)e; // get around unused formal parameter error
-
+        .catchInMainThread([this]([[maybe_unused]]std::exception&& e) {
             return this->_asyncSystem.createResolvedFuture(false);
         });
 }

src/core/src/OmniIonServer.cpp

@@ -5,6 +5,7 @@
 #include "cesium/omniverse/UsdUtil.h"
 
 #include <CesiumUsdSchemas/ionServer.h>
+#include <string>
 
 namespace cesium::omniverse {
 
@@ -17,6 +18,7 @@ OmniIonServer::OmniIonServer(Context* pContext, const pxr::SdfPath& path)
           getIonServerUrl(),
           getIonServerApiUrl(),
           getIonServerApplicationId())) {
+
     _session->resume();
 }