Merge pull request #269 from dymaptic/feature/268-javascript-versioning

adding/updating versioning
dymaptic · Dec 4, 2023 · e0a1234 · e0a1234
2 parents ef7505e + 7499278
commit e0a1234
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/src/dymaptic.GeoBlazor.Core/JsModuleManager.cs b/src/dymaptic.GeoBlazor.Core/JsModuleManager.cs
@@ -1,16 +1,19 @@
 using Microsoft.JSInterop;
+using System.Security.Claims;
 
 namespace dymaptic.GeoBlazor.Core;
 
 internal static class JsModuleManager
 {
     public static async Task<IJSObjectReference> GetArcGisJsCore(IJSRuntime jsRuntime, IJSObjectReference? proModule, CancellationToken cancellationToken)
     {
+        var version = System.Reflection.Assembly.GetAssembly(typeof(JsModuleManager))!.GetName().Version;
+
         if (proModule is null)
         {
             return await jsRuntime
                     .InvokeAsync<IJSObjectReference>("import", cancellationToken, 
-                        "./_content/dymaptic.GeoBlazor.Core/js/arcGisJsInterop.js");
+                        $"./_content/dymaptic.GeoBlazor.Core/js/arcGisJsInterop.js?v={version}");
         }
 
         return await proModule.InvokeAsync<IJSObjectReference>("getCore", cancellationToken);
@@ -21,14 +24,16 @@ public static async Task<IJSObjectReference> GetArcGisJsCore(IJSRuntime jsRuntim
     /// </summary>
     public static async Task<IJSObjectReference?> GetArcGisJsPro(IJSRuntime jsRuntime, CancellationToken cancellationToken)
     {
+        var version = System.Reflection.Assembly.GetAssembly(typeof(JsModuleManager))!.GetName().Version;
+
         LicenseType licenseType = Licensing.GetLicenseType();
 
         switch ((int)licenseType)
         {
             case >= 100:
 
                 return await jsRuntime.InvokeAsync<IJSObjectReference>("import", cancellationToken,
-                    "./_content/dymaptic.GeoBlazor.Pro/js/arcGisPro.js");
+                    $"./_content/dymaptic.GeoBlazor.Pro/js/arcGisPro.js?v={version}");
             default:
                 return null;
         }

diff --git a/src/dymaptic.GeoBlazor.Core/Model/AuthenticationManager.cs b/src/dymaptic.GeoBlazor.Core/Model/AuthenticationManager.cs
@@ -1,4 +1,5 @@
 using dymaptic.GeoBlazor.Core.Components.Views;
+using dymaptic.GeoBlazor.Core.Objects;
 using Microsoft.Extensions.Configuration;
 using Microsoft.JSInterop;
 
@@ -106,7 +107,7 @@ public async Task<bool> Initialize()
             _module = await arcGisJsInterop.InvokeAsync<IJSObjectReference>("getAuthenticationManager",
                 _cancellationTokenSource.Token, DotNetObjectReference.Create(this), ApiKey, AppId, PortalUrl);
         }
-        
+
         return true;
     }
 
@@ -167,20 +168,11 @@ public async Task<IJSObjectReference> GetArcGisJsInterop()
     {
         LicenseType licenseType = Licensing.GetLicenseType();
 
-        switch ((int)licenseType)
-        {
-            case >= 100:
-                // this is here to support the pro extension library
-                IJSObjectReference proModule = await _jsRuntime
-                    .InvokeAsync<IJSObjectReference>("import", _cancellationTokenSource.Token,
-                        "./_content/dymaptic.GeoBlazor.Pro/js/arcGisPro.js");
-
-                return await proModule.InvokeAsync<IJSObjectReference>("getCore");
-            default:
-                return await _jsRuntime
-                    .InvokeAsync<IJSObjectReference>("import", _cancellationTokenSource.Token,
-                        "./_content/dymaptic.GeoBlazor.Core/js/arcGisJsInterop.js");
-        }
+        var token = new CancellationToken();
+        IJSObjectReference? arcGisPro = await JsModuleManager.GetArcGisJsPro(_jsRuntime, token);
+        IJSObjectReference arcGisJsInterop = await JsModuleManager.GetArcGisJsCore(_jsRuntime, arcGisPro, token);
+
+        return arcGisJsInterop;
     }
 
     private readonly IJSRuntime _jsRuntime;