Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-10-05 10:56:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(migrator): fix bug for people simply upgrading existing pro

Browse source
This commit is contained in:
Evan Morikawa 2017-01-16 15:53:47 -08:00
parent 256fd1ef2b
commit 9bca578439
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/browser/nylas-pro-migrator.es6
View file

@ -1,5 +1,6 @@
/* eslint global-require:0 */ /* eslint global-require:0 */
/* eslint import/no-dynamic-require:0 */ /* eslint import/no-dynamic-require:0 */
import fs from 'fs'
import path from 'path' import path from 'path'
import keytar from 'keytar' import keytar from 'keytar'
import Sqlite3 from 'better-sqlite3'; import Sqlite3 from 'better-sqlite3';
@ -27,7 +28,7 @@ class NylasProMigrator {
} }
_shouldMigrate() { _shouldMigrate() {
return !this.config.get("nylasMailBasicMigrationTime") return fs.existsSync(this._basicConfigPath()) && !this.config.get("nylasMailBasicMigrationTime")
} }
_shouldMigrateMailRules() { _shouldMigrateMailRules() {
@ -41,8 +42,9 @@ class NylasProMigrator {
_migrateConfig() { _migrateConfig() {
console.log("---> Migrating config from Nylas Mail Basic") console.log("---> Migrating config from Nylas Mail Basic")
try { try {
// NOTE: If the config doesn't exist // NOTE: If the config doesn't exist this will throw and not
const oldConfig = require(path.join(this._basicConfigPath(), "config.json"))["*"] // migrate.
const oldConfig = require(path.join(this._basicConfigPath(), "config.json"))["*"] || {}
for (const key of Object.keys(oldConfig)) { for (const key of Object.keys(oldConfig)) {
if (key === "nylas" && oldConfig[key]) { if (key === "nylas" && oldConfig[key]) {
delete oldConfig[key].accounts delete oldConfig[key].accounts
@ -76,11 +78,6 @@ class NylasProMigrator {
const token = passwords["Nylas Account"] const token = passwords["Nylas Account"]
if (token) { if (token) {
keytar.replacePassword("Nylas", "Nylas Account", token) keytar.replacePassword("Nylas", "Nylas Account", token)
} else {
// We can't migrate. This means that we don't have the token for
// the identity in our config. We should clear the identity
// since we can't use it.
this.config.set("nylas.identity", null)
} }
} catch (err) { } catch (err) {
console.error(err); console.error(err);