Refactor deserialization of Account

lib/controller/account-manager.js

@@ -24,7 +24,8 @@ class AccountsManager {
   deserialize(config) {
     for (const c of config) {
       const service = require(path.join(this.servicesPath, c.service))
-      service.deserializeAccount(c)
+      const account = service.createAccount(c.id, c.name, c.token)
+      account.deserialize(c)
     }
   }
 

lib/controller/config-store.js

@@ -57,7 +57,7 @@ class ConfigStore {
     this.locked = true
     if (config.version != CONFIG_VERSION)
       config = {} // TODO Report error here
-    if (config.accounts && Array.isArray(config.accounts))
+    if (Array.isArray(config.accounts))
       accountManager.deserialize(config.accounts)
     if (config.window)
       windowManager.initWithConfig(config.window)

lib/model/account.js

@@ -3,27 +3,23 @@ const Signal = require('mini-signals')
 const accountManager = require('../controller/account-manager')
 
 class Account {
-  constructor(service, config) {
+  constructor(service, id, name) {
     this.service = service
-    this.id = config.id
-    this.name = config.name
-    this.icon = config.icon ? config.icon : null
-    this.url = `https://${this.id}.${this.service.id}.com`
+    this.id = id
+    this.name = name
+    this.icon = null
+    this.url = `https://${this.id}.${service.id}.com`
     this.authorizationHeader = null
     this.channels = []
     this.dms = []
     this.emoji = {}
-    this.currentChannelId = config.currentChannelId ? config.currentChannelId : null
+    this.currentChannelId = null
     this.currentUserId = null
     this.currentUserName = null
     this.users = {}
     this.isRead = true
     this.mentions = 0
 
-    // Save the config of channels, since channels are loaded later.
-    if (config.channels)
-      this.channelsConfig = config.channels.reduce((r, i) => { r[i.id] = i; return r }, {})
-
     this.status = 'connecting'
     this.isChannelsReady = false
 
@@ -57,6 +53,16 @@ class Account {
     return config
   }
 
+  deserialize(config) {
+    if (config.icon)
+      this.icon = config.icon
+    if (config.currentChannelId)
+      this.currentChannelId = config.currentChannelId
+    // Save the config of channels, since channels are loaded later.
+    if (config.channels)
+      this.channelsConfig = config.channels.reduce((r, i) => { r[i.id] = i; return r }, {})
+  }
+
   channelsLoaded() {
     if (this.channelsConfig) {
       for (const messageList of this.channels.concat(this.dms)) {

lib/model/service.js

@@ -8,7 +8,7 @@ class Service {
     throw new Error('This method should be implemented by clients')
   }
 
-  deserializeAccount(config) {
+  createAccount(id, name, token) {
     throw new Error('This method should be implemented by clients')
   }
 }

lib/service/slack/index.js

@@ -25,8 +25,8 @@ class SlackService extends Service {
     this.loginWindow.activate()
   }
 
-  deserializeAccount(config) {
-    return new SlackAccount(this, null, null, config)
+  createAccount(id, name, token) {
+    return new SlackAccount(this, id, name, token)
   }
 
   async loginWithToken(token, button) {
@@ -40,7 +40,8 @@ class SlackService extends Service {
     try {
       // Test the token.
       const client = new WebClient(token)
-      new SlackAccount(this, await client.auth.test(), token)
+      const data = await client.auth.test()
+      this.createAccount(data.team_id, data.team, token)
       // Succeeded.
       if (button) {
         this.loginWindow.getContentView().removeChildView(button)

lib/service/slack/slack-account.js

@@ -40,13 +40,9 @@ function filterDM(c) {
 }
 
 class SlackAccount extends Account {
-  constructor(service, data, token, config=null) {
-    if (config)
-      super(service, config)
-    else
-      super(service, {id: data.team_id, name: data.team})
-
-    this.setupRTMClient(config ? config.token : token)
+  constructor(service, id, name, token) {
+    super(service, id, name)
+    this.setupRTMClient(token)
   }
 
   setupRTMClient(token) {