diff --git a/lib/Packets.dart b/lib/Packets.dart index aa4775d..6c76eb5 100644 --- a/lib/Packets.dart +++ b/lib/Packets.dart @@ -295,8 +295,12 @@ class S2CLoginResponsePacket implements IPacket { @override String encode() { - return json - .encode({"type": getType(), "login": loggedIn, "reason": reason}); + return json.encode({ + "type": getType(), + "login": loggedIn, + "reason": reason, + "user": user.encode() + }); } static S2CLoginResponsePacket decode(String params) { diff --git a/lib/pages/LoginAccount.dart b/lib/pages/LoginAccount.dart index c8b3121..2afa328 100644 --- a/lib/pages/LoginAccount.dart +++ b/lib/pages/LoginAccount.dart @@ -64,12 +64,12 @@ class LoginAccountState extends State { APIEndpoint.Login, packet) as S2CLoginResponsePacket; print("RESPONSE : ${response.encode()}"); if (response.loggedIn) { - Navigator.pop(context); ScaffoldMessenger.of(context).showSnackBar( SnackBar(content: Text("Login success"))); settings.loggedIn = true; settings.currentUser = response.user; + Navigator.pop(context); } else { ScaffoldMessenger.of(context).showSnackBar(SnackBar( content: Text( diff --git a/lib/pages/OpenSim.dart b/lib/pages/OpenSim.dart index aa18b4c..e3ebbc1 100644 --- a/lib/pages/OpenSim.dart +++ b/lib/pages/OpenSim.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:flutter/material.dart'; import 'package:footer/footer.dart'; import 'package:footer/footer_view.dart'; @@ -31,6 +33,17 @@ class User { userTitle: map['title'] as String, active: map['active'] as bool); } + + String encode() { + return json.encode({ + "id": ID.toString(), + "first": FirstName, + "last": LastName, + "rez": createdAt, + "title": userTitle, + "active": active + }); + } } class OpenSimPage extends StatefulWidget { diff --git a/pubspec.yaml b/pubspec.yaml index 51794e5..2940162 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: cupertino_icons: ^1.0.6 libac_flutter: hosted: https://git.zontreck.com/api/packages/AriasCreations/pub/ - version: 1.0.2 + version: 1.0.3 dio: ^5.4.3+1 shared_preferences: ^2.2.3 footer: ^0.0.4