vikunja/app-mirror-github
1
0
Fork 0
mirror of https://github.com/go-vikunja/app synced 2024-06-14 00:14:25 +00:00
Code Issues Projects Releases Wiki Activity

fixed problem where API_URL is relative, not absolute

Browse Source
This commit is contained in:
benimautner 2022-05-07 22:10:58 +02:00
parent 792aaca687
commit cb3b53c970
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pages/user/login_webview.dart
View File

@ -42,7 +42,8 @@ class LoginWithWebViewState extends State<LoginWithWebView> {
body: webView
),
onWillPop: () async {
bool hasPopped = await _handlePageFinished("");
String currentUrl = await webViewController.currentUrl();
bool hasPopped = await _handlePageFinished(currentUrl);
return Future.value(!hasPopped);
},);
}
@ -56,10 +57,15 @@ class LoginWithWebViewState extends State<LoginWithWebView> {
String apiUrl = await webViewController.runJavascriptReturningResult("API_URL");
if (localStorage != "{}") {
apiUrl = apiUrl.replaceAll("\"", "");
if(!apiUrl.startsWith("http")) {
if(pageLocation.endsWith("/"))
pageLocation = pageLocation.substring(0,pageLocation.length-1);
apiUrl = pageLocation + apiUrl;
}
localStorage = localStorage.replaceAll("\\", "");
localStorage = localStorage.substring(1, localStorage.length - 1);
var json = jsonDecode(localStorage);
if (apiUrl != "null" && json["token"] != null) {
if (apiUrl != "null" && json["token"] != null) {
BaseTokenPair baseTokenPair = BaseTokenPair(
apiUrl, json["token"]);
Navigator.pop(context, baseTokenPair);