From a63fd9aa533717732e9a147455be8babd81af0a9 Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Thu, 13 Jan 2022 19:30:21 +0100 Subject: [PATCH 1/6] Added GetUserList in LanConfigSecurity --- .../LanConfigSecurityHandler.cs | 18 +++++++++++++++--- .../FritzBox/LANConfigSecurityClient.cs | 14 +++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs b/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs index d588502..d1032ac 100644 --- a/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs +++ b/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs @@ -22,8 +22,9 @@ public override async Task Handle() this.PrintOutputAction($"LanConfigSecurityHandler{Environment.NewLine}########################"); this.PrintOutputAction("1 - GetAnonymousLogin"); this.PrintOutputAction("2 - GetCurrentUser"); - this.PrintOutputAction("3 - GetInfo"); - this.PrintOutputAction("4 - SetConfigPassword"); + this.PrintOutputAction("3 - GetUserList"); + this.PrintOutputAction("4 - GetInfo"); + this.PrintOutputAction("5 - SetConfigPassword"); this.PrintOutputAction("r - Return"); input = this.GetInputFunc(); @@ -39,9 +40,12 @@ public override async Task Handle() await this.GetCurrentUser(); break; case "3": - await this.GetInfo(); + await this.GetUserList(); break; case "4": + await this.GetInfo(); + break; + case "5": await this.SetConfigPassword(); break; case "r": @@ -79,6 +83,14 @@ private async Task GetCurrentUser() this.PrintObject(currentUser); } + private async Task GetUserList() + { + this.ClearOutputAction(); + this.PrintEntry(); + var currentUser = await this._client.GetUserListAsync(); + this.PrintObject(currentUser); + } + private async Task GetInfo() { this.ClearOutputAction(); diff --git a/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs b/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs index f901444..eeed15a 100644 --- a/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs +++ b/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs @@ -97,7 +97,19 @@ public async Task GetCurrentUserAsync() return user; } - + /// + /// Method to get the current user + /// + /// the current user + public async Task GetUserListAsync() + { + XDocument document = await this.InvokeAsync("X_AVM-DE_GetUserList", null); + LANConfigSecurityUserList userList = new LANConfigSecurityUserList(); + + userList.UserList = document.Descendants("NewX_AVM-DE_UserList").First().Value; + + return userList; + } /// /// Method to set the password for the current user From 4600c148f977beb0e1e905a8a44c6be5df311722 Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Thu, 13 Jan 2022 19:56:17 +0100 Subject: [PATCH 2/6] Clean-up --- PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs b/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs index eeed15a..ebb0483 100644 --- a/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs +++ b/PS.FritzBox.API/FritzBox/LANConfigSecurityClient.cs @@ -98,9 +98,9 @@ public async Task GetCurrentUserAsync() } /// - /// Method to get the current user + /// Method to get the user list /// - /// the current user + /// the current userlist public async Task GetUserListAsync() { XDocument document = await this.InvokeAsync("X_AVM-DE_GetUserList", null); From 444575f74a86e07a2f4b94d763575e8e1100606f Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Thu, 13 Jan 2022 20:32:49 +0100 Subject: [PATCH 3/6] Added file in lib --- .../FritzBox/LANConfigSecurityUserList.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs diff --git a/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs b/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs new file mode 100644 index 0000000..c7590c2 --- /dev/null +++ b/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs @@ -0,0 +1,14 @@ +namespace PS.FritzBox.API +{ + /// + /// class representing a userlist + /// + public class LANConfigSecurityUserList + { + /// + /// gets or sets the userlist + /// + public string UserList { get; set; } + + } +} From bb8eaf6292793970043d667a8da25796e6463c63 Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Fri, 14 Jan 2022 00:20:17 +0100 Subject: [PATCH 4/6] Clean-up --- PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs b/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs index c7590c2..fc24b3c 100644 --- a/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs +++ b/PS.FritzBox.API/FritzBox/LANConfigSecurityUserList.cs @@ -1,4 +1,8 @@ -namespace PS.FritzBox.API +using System; +using System.Collections.Generic; +using System.Text; + +namespace PS.FritzBox.API { /// /// class representing a userlist From 52560a5e792c9be5b5367f83c1fc070c4233a1f3 Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Fri, 14 Jan 2022 00:43:10 +0100 Subject: [PATCH 5/6] Clean-up --- PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs b/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs index d1032ac..2db9808 100644 --- a/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs +++ b/PS.FritzBox.API.CMD/LanConfigSecurityHandler.cs @@ -87,8 +87,8 @@ private async Task GetUserList() { this.ClearOutputAction(); this.PrintEntry(); - var currentUser = await this._client.GetUserListAsync(); - this.PrintObject(currentUser); + var userList = await this._client.GetUserListAsync(); + this.PrintObject(userList); } private async Task GetInfo() From 307bfb3a703296fce8d7e8b007b3cf1f4aaaf691 Mon Sep 17 00:00:00 2001 From: RoSchmi Date: Fri, 14 Jan 2022 18:28:49 +0100 Subject: [PATCH 6/6] Clean-up --- PS.FritzBox.API.CMD/Program.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/PS.FritzBox.API.CMD/Program.cs b/PS.FritzBox.API.CMD/Program.cs index 56ad705..585f99d 100644 --- a/PS.FritzBox.API.CMD/Program.cs +++ b/PS.FritzBox.API.CMD/Program.cs @@ -42,7 +42,6 @@ static async Task MainAsync(string[] args) FritzDevice selected = devices.Skip(deviceIndex).First(); Configure(selected); - do { Console.Clear();