need to store access token

yongli-abc · Jan 7, 2018 · 34db9d2 · 34db9d2
1 parent 7c5f1a8
commit 34db9d2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/main.js b/main.js
@@ -1,7 +1,8 @@
 const {app, BrowserWindow, Menu, Tray, ipcMain} = require("electron");
 const path = require("path");
 const url = require("url");
-const config = require("./config.js");
+const config = require("./config");
+const util = require("./src/js/util");
 
 /*
  * Start in development mode
@@ -67,17 +68,18 @@ function setMessageListener() {
         authWindow.webContents.on("did-get-redirect-request", function(event, oldUrl, newUrl) {
             console.log("get redirect request, event=", event, "oldUrl=", oldUrl, "newUrl=", newUrl);
 
-            var error = RegExp('[?&]error=([^&]*)').exec(newUrl);
-            var token = RegExp('[?&#]token=([^&]*)').exec(newUrl); 
-            var expires_in = RegExp('[?&]expires_in=([^&]*)').exec(newUrl);
+            var errorMatch = RegExp('[?&]error=([^&]*)').exec(newUrl);
+            var tokenMatch = RegExp('[?&#]access_token=([^&]*)').exec(newUrl); 
+            var expiresMatch = RegExp('[?&]expires_in=([^&]*)').exec(newUrl);
 
-            if (error) {
-                indexSender.send("login-error", error);
+            if (errorMatch) {
+                indexSender.send("login-error", errorMatch[1]);
+                closeAuthWindow();
+            } else if (tokenMatch && expiresMatch) {
+                var expired_at = new Date((new Date()).getTime() + parseInt(expiresMatch[1]) * 1000);
+                util.user.setToken(tokenMatch[1], expired_at);
+                indexSender.send("login-success");
                 closeAuthWindow();
-            } else if (token && expiresIn) {
-                var expired_at = new Date((new Date()).getTime() + expires_in * 1000);
-                localStorage.access_token = token;
-                localStorage.expired_at = expired_at;
             }
         });
 

diff --git a/src/js/index.js b/src/js/index.js
@@ -26,6 +26,10 @@ util.loadVueP()
     ipcRenderer.on("login-error", (event, arg) => {
         alert("登录授权失败，请重试。");
     });
+
+    ipcRenderer.on("login-success", () => {
+        alert("登录成功, token=", localStorage.access_token, ", expired_at=", localStorage.expired_at);
+    });
 })
 .then(function() {  // start vue app
     app = new Vue({
@@ -35,7 +39,7 @@ util.loadVueP()
             view: k_view.init,
             word: null,
             error: null,
-            hasLogin: util.hasLogin()
+            hasLogin: util.user.tokenValid()
         },
         methods: {
             onFocus: function() {

diff --git a/src/js/util.js b/src/js/util.js
@@ -112,8 +112,8 @@ module.exports = {
             return localStorage.access_token;
         },
         setToken: function(access_token, expired_at) {
-            localStorage.access_token = access_token;
-            localStorage.expired_at = tokenExpired;
+            window.localStorage.access_token = access_token;
+            window.localStorage.expired_at = tokenExpired;
         }
     }
 };