MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Made google-play login working again, and fixed numerous bugs
All checks were successful
update version / increment-build-number (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Elias Müller
2023-08-02 20:56:02 +02:00
parent 2edec5ca3c
commit 62ae6a6e3c
19 changed files with 38 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/view/login/login.dart
View File

@ -1,11 +1,12 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:flutter_login/flutter_login.dart';
import 'package:marianum_mobile/model/timetable/endpointData.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoom.dart';
import 'package:marianum_mobile/api/marianumcloud/talk/room/getRoomParams.dart';
import 'package:provider/provider.dart';
import '../../api/webuntis/queries/authenticate/authenticateParams.dart';
import '../../api/webuntis/queries/authenticate/authenticate.dart';
import '../../model/accountData.dart';
import '../../model/accountModel.dart';
@ -24,26 +25,26 @@ class _LoginState extends State<Login> {
}
Future<String?> _login(LoginData data) async {
await AccountData().removeData(context);
await AccountData().removeData();
try {
EndpointData().usernameOverride = data.name;
await Authenticate(
AuthenticateParams(
user: data.name,
password: data.password,
)
await AccountData().setData(data.name, data.password);
await GetRoom(
GetRoomParams(
includeStatus: false,
),
).run().then((value) async {
EndpointData().usernameOverride = null;
await AccountData().setData(context, data.name, data.password);
await AccountData().setData(data.name, data.password);
setState(() {
displayDisclaimerText = false;
});
});
} catch(e) {
return e.toString();
await AccountData().removeData();
log(e.toString());
return "Benutzername oder Password falsch! (${e.toString()})";
}
await Future.delayed(const Duration(seconds: 1));
return null;
}