Merge Changes for 1.3.0.0 Release

.github/workflows/dotnet.yml

@@ -1,8 +1,8 @@
 name: Meadow.CLI
 env:
-  CLI_RELEASE_VERSION: 1.2.0.0
-  IDE_TOOLS_RELEASE_VERSION: 1.2.0
-  MEADOW_OS_VERSION: 1.2.0.0
+  CLI_RELEASE_VERSION: 1.3.0.0
+  IDE_TOOLS_RELEASE_VERSION: 1.3.0
+  MEADOW_OS_VERSION: 1.3.0.0
   VS_MAC_2019_VERSION: 8.10
   VS_MAC_2022_VERSION: 17.5
 
@@ -62,10 +62,22 @@ jobs:
     - name: Add MSBuild to Path
       uses: microsoft/[email protected]
 
-    - name: Restore dependencies
+    - name: Restore Classic dependencies
+      run: dotnet restore main/MeadowCLI.Classic.sln /p:Configuration=Release
+
+    - name: Build Classic CLI
+      run: dotnet build main/MeadowCLI.Classic.sln /p:Configuration=Release
+
+    - name: Upload nuget Artifacts for internal testing
+      uses: actions/upload-artifact@v2
+      with:
+        name: Meadow.CLI.Classic.nuget.${{ ENV.CLI_RELEASE_VERSION }}
+        path: 'main\Meadow.CLI.Classic\bin\Release\*.nupkg'
+
+    - name: Restore normal dependencies
       run: dotnet restore main/MeadowCLI.sln /p:Configuration=Release
 
-    - name: Build
+    - name: Build normal CLI
       run: dotnet build main/MeadowCLI.sln /p:Configuration=Release
 
     - name: Upload nuget Artifacts for internal testing

Meadow.CLI.Core/CloudServices/CloudServiceBase.cs

@@ -1,32 +1,30 @@
 using Meadow.CLI.Core.Exceptions;
 using Meadow.CLI.Core.Identity;
-using System;
-using System.Collections.Generic;
-using System.Net.Http.Headers;
 using System.Net.Http;
-using System.Text;
+using System.Net.Http.Headers;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Meadow.CLI.Core.CloudServices
 {
     public abstract class CloudServiceBase
     {
-        IdentityManager _identityManager;
+        readonly IdentityManager _identityManager;
 
         protected CloudServiceBase(IdentityManager identityManager)
         {
             _identityManager = identityManager;
         }
 
-        protected async Task<HttpClient> AuthenticatedHttpClient()
+        protected async Task<HttpClient> GetAuthenticatedHttpClient(CancellationToken cancellationToken = default)
         {
-            var authToken = await _identityManager.GetAccessToken();
+            var authToken = await _identityManager.GetAccessToken(cancellationToken);
             if (string.IsNullOrEmpty(authToken))
             {
                 throw new MeadowCloudAuthException();
             }
 
-            HttpClient client = new HttpClient();
+            HttpClient client = new();
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
 
             return client;

Meadow.CLI.Core/CloudServices/CollectionService.cs

@@ -1,28 +1,20 @@
-using System;
+using Meadow.CLI.Core.CloudServices.Messages;
+using Meadow.CLI.Core.Identity;
+using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Meadow.CLI.Core.CloudServices.Messages;
-using Meadow.CLI.Core.DeviceManagement.Tools;
-using Meadow.CLI.Core.Exceptions;
-using Meadow.CLI.Core.Identity;
-using Microsoft.Extensions.Configuration;
 
 namespace Meadow.CLI.Core.CloudServices;
 
 public class CollectionService : CloudServiceBase
 {
-    IConfiguration _config;
-    IdentityManager _identityManager;
+    readonly IConfiguration _config;
 
     public CollectionService(IConfiguration config, IdentityManager identityManager) : base(identityManager)
     {
         _config = config;
-        _identityManager = identityManager;
     }
 
     public async Task<List<Collection>> GetOrgCollections(string orgId, string host, CancellationToken cancellationToken)
@@ -32,16 +24,9 @@ public async Task<List<Collection>> GetOrgCollections(string orgId, string host,
             host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
         }
 
-        var authToken = await _identityManager.GetAccessToken(cancellationToken).ConfigureAwait(false);
-        if (string.IsNullOrEmpty(authToken))
-        {
-            throw new MeadowCloudAuthException();
-        }
-
-        HttpClient httpClient = new HttpClient();
-        httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
+        var httpClient = await GetAuthenticatedHttpClient(cancellationToken);
 
         var result = await httpClient.GetStringAsync($"{host}/api/orgs/{orgId}/collections");
-        return JsonSerializer.Deserialize<List<Collection>>(result);
+        return JsonSerializer.Deserialize<List<Collection>>(result) ?? new List<Collection>();
     }
 }

Meadow.CLI.Core/CloudServices/CommandService.cs

@@ -0,0 +1,86 @@
+using Meadow.CLI.Core.Exceptions;
+using Meadow.CLI.Core.Identity;
+using Microsoft.Extensions.Configuration;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Meadow.CLI.Core.CloudServices
+{
+    public class CommandService : CloudServiceBase
+    {
+        readonly IConfiguration _config;
+        readonly IdentityManager _identityManager;
+
+        public CommandService(IConfiguration config, IdentityManager identityManager) : base(identityManager)
+        {
+            _config = config;
+            _identityManager = identityManager;
+        }
+
+        public async Task PublishCommandForCollection(
+            string collectionId,
+            string commandName,
+            JsonDocument? arguments = null,
+            int qualityOfService = 0,
+            string? host = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
+            var httpClient = await GetAuthenticatedHttpClient(cancellationToken);
+
+            var payload = new 
+            { 
+                commandName, 
+                args = arguments,
+                qos = qualityOfService
+            };
+            var content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
+            var response = await httpClient.PostAsync($"{host}/api/collections/{collectionId}/commands", content, cancellationToken);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                var message = await response.Content.ReadAsStringAsync();
+                throw new MeadowCloudException(message);
+            }
+        }
+
+        public async Task PublishCommandForDevices(
+            string[] deviceIds,
+            string commandName,
+            JsonDocument? arguments = null,
+            int qualityOfService = 0,
+            string? host = null,
+            CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
+            var httpClient = await GetAuthenticatedHttpClient(cancellationToken);
+
+            var payload = new
+            {
+                deviceIds,
+                commandName,
+                args = arguments,
+                qos = qualityOfService
+            };
+            var content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
+            var response = await httpClient.PostAsync($"{host}/api/devices/commands", content, cancellationToken);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                var message = await response.Content.ReadAsStringAsync();
+                throw new MeadowCloudException(message);
+            }
+        }
+    }
+}

Meadow.CLI.Core/CloudServices/DeviceService.cs

@@ -1,46 +1,46 @@
-using System;
+using Meadow.CLI.Core.Identity;
+using Microsoft.Extensions.Configuration;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
-using Meadow.CLI.Core.Exceptions;
-using Meadow.CLI.Core.Identity;
-using Microsoft.Extensions.Configuration;
 
 namespace Meadow.CLI.Core.CloudServices
 {
     public class DeviceService : CloudServiceBase
     {
-        IConfiguration _config;
+        readonly IConfiguration _config;
 
         public DeviceService(IConfiguration config, IdentityManager identityManager) : base(identityManager)
         {
             _config = config;
         }
-
-        public async Task<(bool isSuccess, string message)> AddDevice(string orgId, string id, string publicKey, string collectionId, string host)
+        
+        public async Task<(bool isSuccess, string message)> AddDevice(string orgId, string id, string publicKey, string collectionId, string name, string host, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(host))
             {
                 host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
             }
 
-            var httpClient = await AuthenticatedHttpClient();
+            var httpClient = await GetAuthenticatedHttpClient(cancellationToken);
 
             dynamic payload = new
             {
                 orgId,
                 id,
                 publicKey,
-                collectionId
+                collectionId,
+                name
             };
 
             var json = JsonSerializer.Serialize<dynamic>(payload);
 
             var content = new StringContent(json, Encoding.UTF8, "application/json");
-            var response  = await httpClient.PostAsync($"{host}/api/devices", content);
 
+            var response  = await httpClient.PostAsync($"{host}/api/devices", content, cancellationToken);
+
             if (response.IsSuccessStatusCode)
             {
                 return (response.IsSuccessStatusCode, string.Empty);
@@ -50,7 +50,6 @@ public DeviceService(IConfiguration config, IdentityManager identityManager) : b
                 var message = await response.Content.ReadAsStringAsync();
                 return (false, message);
             }
-
         }
     }
 }

Meadow.CLI.Core/CloudServices/Messages/User.cs

@@ -0,0 +1,10 @@
+namespace Meadow.CLI.Core.CloudServices.Messages;
+
+public class User
+{
+    public string Id { get; set; }
+    public string Email { get; set; }
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string FullName { get; set; }
+}