fix: use otp as unique id for registering client through apkam

atsign-foundation · Oct 4, 2024 · 8b269dc · 8b269dc
1 parent 646048b
commit 8b269dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tools/windows-installer/NoPortsInstaller/ActivateController.cs b/tools/windows-installer/NoPortsInstaller/ActivateController.cs
@@ -134,9 +134,8 @@ public static AtsignStatus Status(string atsign)
         public static bool Enroll(string otp)
         {
             string devName = _controller.DeviceName;
-            if (devName == null || devName.Length == 0) devName = "client";
             var args =
-                $"enroll -a \"{_controller.DeviceAtsign}\" -s {otp} -p {AppName} -d {_controller.DeviceName} -n \"{Namespaces[0]}\" -k {Path.Combine(_controller.AtsignKeysDirectory, _controller.DeviceAtsign + "_key.atKeys")}";
+                $"enroll -a \"{_controller.DeviceAtsign}\" -s \"{otp}\" -p \"{AppName}\" -d \"{devName}\" -n \"sshnp:rw,sshrvd:rw\" -k \"{Path.Combine(_controller.AtsignKeysDirectory, _controller.DeviceAtsign + "_key.atKeys")}\"";
             string response = "";
             try
             {

diff --git a/tools/windows-installer/NoPortsInstaller/Pages/Activate/Enroll.xaml.cs b/tools/windows-installer/NoPortsInstaller/Pages/Activate/Enroll.xaml.cs
@@ -101,9 +101,11 @@ private async void Generate_Click(object sender, RoutedEventArgs e)
             EnrollResponse.Content = "";
             string otp = $"{OtpBox1.Text}{OtpBox2.Text}{OtpBox3.Text}{OtpBox4.Text}{OtpBox5.Text}{OtpBox6.Text}".ToUpper();
 
+            _controller.DeviceName = _controller.NormalizeDeviceName($"client_{otp}");
             Loading.Visibility = Visibility.Visible;
             bool value = await Task.Run(() => ActivateController.Enroll(otp));
-            if (value)
+			Loading.Visibility = Visibility.Hidden;
+			if (value)
             {
                 _controller.NextPage();
             }