Commit d184e756 authored by Amy Yan's avatar Amy Yan

switched to using keytar for token storage

parent 61ec76cf
This diff is collapsed.
......@@ -23,6 +23,7 @@
"axios": "^0.19.2",
"core-js": "^3.6.4",
"glob": "^7.1.6",
"keytar": "^7.2.0",
"md5-file": "^5.0.0",
"moment": "^2.27.0",
"ncp": "^2.0.0",
......
......@@ -6,6 +6,7 @@ const http = require('http');
const https = require('https');
const path = require('path');
const uniqid = require('uniqid');
const keytar = require('keytar')
let win;
let deeplinkingData;
......@@ -211,3 +212,7 @@ function download(url, fileName, cb) {
if (cb) cb(err.message, dest);
});
};
ipcMain.on("setToken", (event, ipcData) => {
keytar.setPassword('Spinshare', 'ConnectToken', ipcData.ConnectToken);
})
......@@ -27,6 +27,9 @@
import Loading from '@/components/Loading.vue';
import { remote, ipcRenderer } from 'electron';
import keytar from 'keytar';
export default {
name: 'Login',
components: {
......@@ -42,14 +45,16 @@
apiLoginServerError: false
}
},
mounted: function() {
mounted: async function() {
let ssapi = new SSAPI();
let userSettings = new UserSettings();
if(!userSettings.get("connectToken")) {
let token = await keytar.findPassword('Spinshare');
if(!token) {
this.showLoginBox();
} else {
ssapi.validateConnectToken(userSettings.get("connectToken")).then((data) => {
ssapi.validateConnectToken(token).then((data) => {
if(data) {
this.$router.replace({ name: 'StartupFrontpage' });
} else {
......@@ -79,7 +84,9 @@
switch(data.status) {
case 200:
// Successfull
userSettings.set("connectToken", data.data);
ipcRenderer.send("setToken", {
ConnectToken: data.data
});
this.$router.replace({ name: 'StartupFrontpage' });
break;
case 403:
......@@ -98,6 +105,9 @@
this.$data.apiLoginLoading = false;
this.$data.apiLoginCodeError = false;
this.$data.apiLoginServerError = false;
},
getCredentialFromStore: async function() {
return await keytar.findPassword('Spinshare');
}
},
watch: {
......
......@@ -26,7 +26,8 @@ module.exports = {
dmg: {
backgroundColor: "#212629"
}
}
},
externals: ['keytar']
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment