try to fix problem on macos

makos135 · Oct 10, 2023 · 70bf726 · 70bf726
1 parent 36ab0ca
commit 70bf726
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -37,6 +37,8 @@ To access data
 
 ```WebApp.CloudStorage.getItem('token', (err, token) => { });```
 
+!!! FOR SOME REASON ON MACOS I DO NOT RECEIVE CALLBACK HERE
+
 getItem method has callback function as second parameter where we can access data (or got error)
 
 When user open application first time application sends information about user to backend, save user information in database and return token for next user authentication. This token is stored in `WebApp.CloudStorage` for latter usage. (This is not the best solution of authentication as token is not refreshed, this should be changed letter).

diff --git a/src/store/store.js b/src/store/store.js
@@ -38,20 +38,31 @@ const fetchToken = () => {
             tryToLinkToRoom();
             resolve();
         }
-        WebApp.CloudStorage.getItem('token', (err, token) => {
-            if (!err && token) {
-                TOKEN = token;
+
+        if(WebApp.platform === 'macos') {
+            initUser().then(json => {
+                TOKEN = json.token;
+                WebApp.CloudStorage.setItem('token', TOKEN);
                 tryToLinkToRoom();
                 resolve();
-            } else {
-                initUser().then(json => {
-                    TOKEN = json.token;
-                    WebApp.CloudStorage.setItem('token', TOKEN);
+            }).catch(reject);
+        }
+        else {
+            WebApp.CloudStorage.getItem('token', (err, token) => {
+                if (!err && token) {
+                    TOKEN = token;
                     tryToLinkToRoom();
                     resolve();
-                }).catch(reject);
-            }
-        });
+                } else {
+                    initUser().then(json => {
+                        TOKEN = json.token;
+                        WebApp.CloudStorage.setItem('token', TOKEN);
+                        tryToLinkToRoom();
+                        resolve();
+                    }).catch(reject);
+                }
+            });
+        }
     })
 }