Improve auth method API

microsoft · Jan 23, 2024 · 30306e5 · 30306e5
1 parent 4cda782
commit 30306e5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/protocol/protos/NetRemoteWifi.proto b/protocol/protos/NetRemoteWifi.proto
@@ -77,7 +77,7 @@ message WifiAccessPointSetPhyTypeResult
 message WifiAccessPointSetAuthenticationMethodRequest
 {
     string AccessPointId = 1;
-    Microsoft.Net.Wifi.Dot11AuthenticationAlgorithm AuthenticationAlgorithm = 2;
+    Microsoft.Net.Wifi.WifiAuthenticationMethodConfiguration AuthenticationMethodConfiguration = 2;
 }
 
 message WifiAccessPointSetAuthenticationMethodResult

diff --git a/protocol/protos/WifiCore.proto b/protocol/protos/WifiCore.proto
@@ -131,3 +131,31 @@ enum AccessPointState
 {
     AccessPointStateUnknown = 0;
 }
+
+message WifiAuthenticationMethodConfigurationNone
+{
+
+}
+
+message WifiAuthenticationMethodConfigurationSharedKey
+{
+    Microsoft.Net.Wifi.SharedKey SharedKey = 1;
+}
+
+message WifiAuthenticationMethodConfigurationEnterprise
+{
+    string RadiusServerAddress = 1;
+    string RadiusServerPort = 2;
+    string RadiusServerSharedSecret = 3;
+}
+
+message WifiAuthenticationMethodConfiguration
+{
+    Microsoft.Net.Wifi.Dot11AuthenticationAlgorithm AuthenticationAlgorithm = 1;
+    oneof Configuration
+    {
+        WifiAuthenticationMethodConfigurationNone ConfigurationNone = 2;
+        WifiAuthenticationMethodConfigurationSharedKey ConfigurationSharedKey = 3;
+        WifiAuthenticationMethodConfigurationEnterprise ConfigurationEnterprise = 4;
+    }
+}
diff --git a/src/common/service/NetRemoteService.cxx b/src/common/service/NetRemoteService.cxx
@@ -417,7 +417,7 @@ NetRemoteService::WifiAccessPointSetAuthenticationMethod([[maybe_unused]] ::grpc
 
     WifiAccessPointOperationStatus status{};
 
-    if (request->authenticationalgorithm() == Dot11AuthenticationAlgorithm::Dot11AuthenticationAlgorithmUnknown)
+    if (request->authenticationmethodconfiguration().authenticationalgorithm() == Dot11AuthenticationAlgorithm::Dot11AuthenticationAlgorithmUnknown)
     {
         status.set_code(WifiAccessPointOperationStatusCode::WifiAccessPointOperationStatusCodeInvalidParameter);
         status.set_message("No authentication algorithm provided");