luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-14 05:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Connect with no authentication

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-03-24 21:17:48 +01:00
parent df6af8a29a
commit 9cf505e27a
3 changed files with 27 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/widgets/add_server_modal.dart
View file

@ -44,10 +44,8 @@ class _AddServerModalState extends State<AddServerModal> {
String? portError;
final TextEditingController userController = TextEditingController();
String? userError;
final TextEditingController passwordController = TextEditingController();
String? passwordError;
bool defaultServer = false;
@ -114,9 +112,7 @@ class _AddServerModalState extends State<AddServerModal> {
ipDomainController.text != '' &&
ipDomainError == null &&
pathError == null &&
portError == null &&
userController.text != '' &&
passwordController.text != ''
portError == null
) {
setState(() {
allDataValid = true;
@ -196,34 +192,6 @@ class _AddServerModalState extends State<AddServerModal> {
checkDataValid();
}
void validateUser(String? value) {
if (value != null && value != '') {
setState(() {
userError = null;
});
}
else {
setState(() {
userError = AppLocalizations.of(context)!.userNotEmpty;
});
}
checkDataValid();
}
void validatePassword(String? value) {
if (value != null && value != '') {
setState(() {
passwordError = null;
});
}
else {
setState(() {
passwordError = AppLocalizations.of(context)!.passwordNotEmpty;
});
}
checkDataValid();
}
@override
void initState() {
if (widget.server != null) {
@ -232,8 +200,8 @@ class _AddServerModalState extends State<AddServerModal> {
ipDomainController.text = widget.server!.domain;
pathController.text = widget.server!.path ?? '';
portController.text = widget.server!.port != null ? widget.server!.port.toString() : "";
userController.text = widget.server!.user;
passwordController.text = widget.server!.password;
userController.text = widget.server!.user ?? "";
passwordController.text = widget.server!.password ?? "";
defaultServer = widget.server!.defaultServer;
homeAssistant = widget.server!.runningOnHa;
}
@ -255,12 +223,12 @@ class _AddServerModalState extends State<AddServerModal> {
connectionMethod: connectionType.name,
domain: ipDomainController.text,
port: portController.text != '' ? int.parse(portController.text) : null,
user: userController.text,
password: passwordController.text,
user: userController.text != "" ? userController.text : null,
password: passwordController.text != "" ? passwordController.text : null,
defaultServer: defaultServer,
authToken: homeAssistant == true
? encodeBase64UserPass(userController.text, passwordController.text)
: '',
: null,
runningOnHa: homeAssistant
);
setState(() => isConnecting = true);
@ -272,7 +240,9 @@ class _AddServerModalState extends State<AddServerModal> {
setState(() => isConnecting = false);
if (result['result'] == 'success') {
serverObj.authToken = encodeBase64UserPass(serverObj.user, serverObj.password);
if (serverObj.user != null && serverObj.password != null) {
serverObj.authToken = encodeBase64UserPass(serverObj.user!, serverObj.password!);
}
final serverCreated = await serversProvider.createServer(serverObj);
if (serverCreated == null) {
serversProvider.setServerStatusLoad(0);
@ -366,12 +336,12 @@ class _AddServerModalState extends State<AddServerModal> {
connectionMethod: connectionType.name,
domain: ipDomainController.text,
port: portController.text != '' ? int.parse(portController.text) : null,
user: userController.text,
password: passwordController.text,
user: userController.text != "" ? userController.text : null,
password: passwordController.text != "" ? passwordController.text : null,
defaultServer: defaultServer,
authToken: homeAssistant == true
? encodeBase64UserPass(userController.text, passwordController.text)
: '',
: null,
runningOnHa: homeAssistant
);
@ -380,7 +350,9 @@ class _AddServerModalState extends State<AddServerModal> {
: await login(serverObj);
if (result['result'] == 'success') {
serverObj.authToken = encodeBase64UserPass(serverObj.user, serverObj.password);
if (serverObj.user != null && serverObj.password != null) {
serverObj.authToken = encodeBase64UserPass(serverObj.user!, serverObj.password!);
}
final serverSaved = await serversProvider.editServer(serverObj);
if (serverSaved == null) {
Navigator.pop(context);
@ -576,8 +548,6 @@ class _AddServerModalState extends State<AddServerModal> {
label: AppLocalizations.of(context)!.username,
controller: userController,
icon: Icons.person_rounded,
onChanged: validateUser,
error: userError
),
const SizedBox(height: 20),
textField(
@ -585,8 +555,6 @@ class _AddServerModalState extends State<AddServerModal> {
controller: passwordController,
icon: Icons.lock_rounded,
keyboardType: TextInputType.visiblePassword,
onChanged: validatePassword,
error: passwordError,
obscureText: true
),
sectionLabel(AppLocalizations.of(context)!.other),