yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix login button

Browse Source
This commit is contained in:
estevez-dev 2019-04-05 14:07:03 +03:00
parent 93af1eca7e
commit 8c1ad9c7f9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/auth_manager.class.dart
View File

@ -27,16 +27,18 @@ class AuthManager {
String tempToken = json.decode(response)['access_token']; String tempToken = json.decode(response)['access_token'];
Logger.d("Closing webview..."); Logger.d("Closing webview...");
flutterWebviewPlugin.close(); flutterWebviewPlugin.close();
eventBus.fire(StartAuthEvent(oauthUrl, false));
completer.complete(tempToken); completer.complete(tempToken);
}).catchError((e) { }).catchError((e) {
flutterWebviewPlugin.close(); flutterWebviewPlugin.close();
completer.completeError({"errorCode": 61, "errorMessage": "Error getting temp token"});
Logger.e("Error getting temp token: ${e.toString()}"); Logger.e("Error getting temp token: ${e.toString()}");
eventBus.fire(StartAuthEvent(oauthUrl, false));
completer.completeError({"errorCode": 61, "errorMessage": "Error getting temp token"});
}); });
} }
}); });
Logger.d("Launching OAuth..."); Logger.d("Launching OAuth...");
eventBus.fire(StartAuthEvent(oauthUrl)); eventBus.fire(StartAuthEvent(oauthUrl, true));
return completer.future; return completer.future;
} }

2
lib/connection.class.dart
View File

@ -73,6 +73,8 @@ class Connection {
Logger.d("Token from AuthManager recived"); Logger.d("Token from AuthManager recived");
_tempToken = token; _tempToken = token;
_doConnect(completer: completer, forceReconnect: forceReconnect); _doConnect(completer: completer, forceReconnect: forceReconnect);
}).catchError((e) {
completer.completeError(e);
}); });
} else { } else {
_doConnect(completer: completer, forceReconnect: forceReconnect); _doConnect(completer: completer, forceReconnect: forceReconnect);

8
lib/main.dart
View File

@ -284,7 +284,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
if (_startAuthSubscription == null) { if (_startAuthSubscription == null) {
_startAuthSubscription = eventBus.on<StartAuthEvent>().listen((event){ _startAuthSubscription = eventBus.on<StartAuthEvent>().listen((event){
setState(() { setState(() {
_showLoginButton = true; _showLoginButton = event.showButton;
}); });
}); });
} }
@ -651,11 +651,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
value: "reload", value: "reload",
)); ));
List<Widget> emptyBody = [ List<Widget> emptyBody = [
Icon( Text("."),
MaterialDesignIcons.getIconDataFromIconName("mdi:border-none-variant"),
size: 100.0,
color: Colors.black26,
),
]; ];
if (Connection().isAuthenticated) { if (Connection().isAuthenticated) {
_showLoginButton = false; _showLoginButton = false;

3
lib/utils.class.dart
View File

@ -115,8 +115,9 @@ class ReloadUIEvent {
class StartAuthEvent { class StartAuthEvent {
String oauthUrl; String oauthUrl;
bool showButton;
StartAuthEvent(this.oauthUrl); StartAuthEvent(this.oauthUrl, this.showButton);
} }
class ServiceCallEvent { class ServiceCallEvent {