Merge pull request #535 from WildernessLabs/bug/provision-id

generate provision command
WildernessLabs · Mar 15, 2024 · 68db664 · 68db664
2 parents b41a8fc + d3f3577
commit 68db664
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/Source/v2/Meadow.Cli/Commands/Current/Device/DeviceProvisionCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Device/DeviceProvisionCommand.cs
@@ -30,15 +30,48 @@ public class DeviceProvisionCommand : BaseDeviceCommand<DeviceProvisionCommand>
     [CommandOption("id", 'i', Description = "The unique ID/serial number of the device to provision.  If not provided, it will be queried from the configured device.", IsRequired = false)]
     public string? SerialNumber { get; set; }
 
+    [CommandOption("gen-command", Description = "Generate a provisioning command for the configured device", IsRequired = false)]
+    public bool GenerateProvisionCommand { get; set; }
+
     public DeviceProvisionCommand(UserService userService, DeviceService deviceService, MeadowConnectionManager connectionManager, ILoggerFactory loggerFactory)
         : base(connectionManager, loggerFactory)
     {
         _deviceService = deviceService;
         _userService = userService;
     }
 
+    private async ValueTask OutputProvisionCommand()
+    {
+        var device = await GetCurrentDevice();
+
+        var info = await device.GetDeviceInfo(CancellationToken);
+
+        Logger?.LogInformation(Strings.RequestingDevicePublicKey);
+
+        var publicKey = await device.GetPublicKey(CancellationToken);
+        publicKey = publicKey.Replace("\r", string.Empty).Replace("\n", string.Empty);
+        var provisioningID = !string.IsNullOrWhiteSpace(info?.ProcessorId) ? info.ProcessorId : info?.SerialNumber;
+
+        var command = "meadow device provision";
+        if (!string.IsNullOrWhiteSpace(OrgId))
+        {
+            command += $" -o {OrgId}";
+        }
+        command += $" -id \"{provisioningID}\" -k \"{publicKey}\"";
+        Logger?.LogInformation($"Provisioning command is:");
+        Logger?.LogInformation(command);
+    }
+
     protected override async ValueTask ExecuteCommand()
     {
+        if (GenerateProvisionCommand)
+        {
+            Logger?.LogInformation("Generating a device provisioning command...");
+
+            await OutputProvisionCommand();
+            return;
+        }
+
         UserOrg? org;
 
         try

diff --git a/Source/v2/Meadow.Cli/Properties/launchSettings.json b/Source/v2/Meadow.Cli/Properties/launchSettings.json
@@ -221,7 +221,11 @@
     },
     "Device provision": {
       "commandName": "Project",
-      "commandLineArgs": "device provision"
+      "commandLineArgs": "device provision -o christacke6612"
+    },
+    "Device provision command": {
+      "commandName": "Project",
+      "commandLineArgs": "device provision --gen-command"
     },
     "Device provision other": {
       "commandName": "Project",