From ef8cffc3673a5dadac2fc2a48aa435a01406a2c2 Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Thu, 21 Mar 2024 17:51:32 -0400 Subject: [PATCH 1/3] Update IDSDKManager.cs --- src/DynamoCore/Core/IDSDKManager.cs | 50 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/DynamoCore/Core/IDSDKManager.cs b/src/DynamoCore/Core/IDSDKManager.cs index 007070fd771..c8acdcca1b6 100644 --- a/src/DynamoCore/Core/IDSDKManager.cs +++ b/src/DynamoCore/Core/IDSDKManager.cs @@ -213,38 +213,38 @@ private string IDSDK_GetToken() private bool Initialize() { - if (Client.IsInitialized()) return true; - idsdk_status_code bRet = Client.Init(); - - if (Client.IsSuccess(bRet)) + try { - if (Client.IsInitialized()) + if (Client.IsInitialized()) return true; + idsdk_status_code bRet = Client.Init(); + + if (Client.IsSuccess(bRet)) { - try + if (Client.IsInitialized()) { - IntPtr hWnd = Process.GetCurrentProcess().MainWindowHandle; - if (hWnd != null) - { - Client.SetHost(hWnd); - } + IntPtr hWnd = Process.GetCurrentProcess().MainWindowHandle; + if (hWnd != null) + { + Client.SetHost(hWnd); + } - bool ret = GetClientIDAndServer(out idsdk_server server, out string client_id); - if (ret) - { - Client.LogoutCompleteEvent += AuthCompleteEventHandler; - Client.LoginCompleteEvent += AuthCompleteEventHandler; - ret = SetProductConfigs(Configurations.DynamoAsString, server, client_id); - Client.SetServer(server); - return ret; - } - } - catch (Exception) - { - return false; + bool ret = GetClientIDAndServer(out idsdk_server server, out string client_id); + if (ret) + { + Client.LogoutCompleteEvent += AuthCompleteEventHandler; + Client.LoginCompleteEvent += AuthCompleteEventHandler; + ret = SetProductConfigs(Configurations.DynamoAsString, server, client_id); + Client.SetServer(server); + return ret; + } } } + return false; + } + catch (Exception) + { + return false; } - return false; } private bool Deinitialize() { From 6a422d0a7a5a48f70ce6f566806aa0c7b98fe87c Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Thu, 21 Mar 2024 17:54:50 -0400 Subject: [PATCH 2/3] Update IDSDKManager.cs --- src/DynamoCore/Core/IDSDKManager.cs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/DynamoCore/Core/IDSDKManager.cs b/src/DynamoCore/Core/IDSDKManager.cs index c8acdcca1b6..18a1ca00104 100644 --- a/src/DynamoCore/Core/IDSDKManager.cs +++ b/src/DynamoCore/Core/IDSDKManager.cs @@ -222,21 +222,21 @@ private bool Initialize() { if (Client.IsInitialized()) { - IntPtr hWnd = Process.GetCurrentProcess().MainWindowHandle; - if (hWnd != null) - { - Client.SetHost(hWnd); - } + IntPtr hWnd = Process.GetCurrentProcess().MainWindowHandle; + if (hWnd != null) + { + Client.SetHost(hWnd); + } - bool ret = GetClientIDAndServer(out idsdk_server server, out string client_id); - if (ret) - { - Client.LogoutCompleteEvent += AuthCompleteEventHandler; - Client.LoginCompleteEvent += AuthCompleteEventHandler; - ret = SetProductConfigs(Configurations.DynamoAsString, server, client_id); - Client.SetServer(server); - return ret; - } + bool ret = GetClientIDAndServer(out idsdk_server server, out string client_id); + if (ret) + { + Client.LogoutCompleteEvent += AuthCompleteEventHandler; + Client.LoginCompleteEvent += AuthCompleteEventHandler; + ret = SetProductConfigs(Configurations.DynamoAsString, server, client_id); + Client.SetServer(server); + return ret; + } } } return false; From 997c3f917aa3f403db4c0f360d5ad42ddc0b9bb6 Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Fri, 22 Mar 2024 15:46:28 -0400 Subject: [PATCH 3/3] add logs --- src/DynamoCore/Core/IDSDKManager.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/DynamoCore/Core/IDSDKManager.cs b/src/DynamoCore/Core/IDSDKManager.cs index 18a1ca00104..c3aff23ea2a 100644 --- a/src/DynamoCore/Core/IDSDKManager.cs +++ b/src/DynamoCore/Core/IDSDKManager.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using Autodesk.IDSDK; using Dynamo.Configuration; +using DynamoServices; using Greg; using Greg.AuthProviders; using RestSharp; @@ -239,10 +240,12 @@ private bool Initialize() } } } + DynamoConsoleLogger.OnLogMessageToDynamoConsole("Auth Service (IDSDK) could not be initialized!"); return false; } catch (Exception) { + DynamoConsoleLogger.OnLogMessageToDynamoConsole("An error occurred while initializing Auth Service (IDSDK)."); return false; } }