From 36876be1238a20c36c6e73d809c7bf1598d7bf19 Mon Sep 17 00:00:00 2001
From: f0x <f@0x52.eu>
Date: Tue, 9 Apr 2019 19:09:55 +0200
Subject: [PATCH] let userid work with and without @

---
 app.js              | 1 +
 components/Login.js | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 5d515c0..7af99a5 100644
--- a/app.js
+++ b/app.js
@@ -42,6 +42,7 @@ let App = create({
   },
 
   loginCallback: function(userId, accessToken, apiUrl) {
+    userId = '@' + userId.replace('@', '')
     let backend = new Matrix(userId, accessToken, apiUrl)
     this.setState({
       backend: backend
diff --git a/components/Login.js b/components/Login.js
index 6a88d15..aaa1bd9 100644
--- a/components/Login.js
+++ b/components/Login.js
@@ -67,9 +67,11 @@ let login = create({
     }).then((response) => response.json())
     .then((responseJson) => {
       console.log("got access token", responseJson)
-      this.setState({json: responseJson});
+      this.setState({json: responseJson})
       if(responseJson.access_token != undefined) {
-        this.props.callback(user, responseJson.access_token, hs)
+        this.props.callback(responseJson.user_id, responseJson.access_token, hs)
+      } else {
+        this.setState({error: responseJson.error})
       }
     })
     .catch((error) => {