v3.2.2

CoNETProject · Nov 29, 2019 · 70aafa0 · 70aafa0
1 parent bd930b0
commit 70aafa0
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 147 deletions.
diff --git a/app/localWebServer.js b/app/localWebServer.js
@@ -239,11 +239,17 @@ class localServer {
                 console.log(`active key success! \n[${key}]`);
                 this.keyPair.publicKey = this.config.keypair.publicKey = key;
                 this.keyPair.verified = this.config.keypair.verified = true;
+                this.imapConnectData.sendToQTGate = true;
+                _callBack();
+                Tool.saveEncryptoData(Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
+                    if (err) {
+                        saveLog(`Tool.saveConfig return Error: [${err.message}]`);
+                    }
+                });
                 return Tool.saveConfig(this.config, err => {
                     if (err) {
                         saveLog(`Tool.saveConfig return Error: [${err.message}]`);
                     }
-                    _callBack();
                 });
             }
         });

diff --git a/app/localWebServer.ts b/app/localWebServer.ts
@@ -215,7 +215,8 @@ export default class localServer {
 			}
 			if ( !this.imapConnectData.confirmRisk ) {
 				this.imapConnectData.confirmRisk = true
-				return Tool.saveEncryptoData (  Tool.imapDataFileName1,this.imapConnectData, this.config, this.savedPasswrod, err => {
+
+				return Tool.saveEncryptoData (  Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
 					return this.tryConnectCoNET ( socket, sessionHash )
 				})
 			}
@@ -252,12 +253,20 @@ export default class localServer {
 				console.log ( `active key success! \n[${ key }]`)
 
 				this.keyPair.publicKey = this.config.keypair.publicKey = key
-				this.keyPair.verified = this.config.keypair.verified = true 
+				this.keyPair.verified = this.config.keypair.verified = true
+				this.imapConnectData.sendToQTGate = true
+				_callBack ()
+				Tool.saveEncryptoData (  Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
+					if ( err ) {
+						saveLog (`Tool.saveConfig return Error: [${ err.message }]`)
+					}
+				})
 				return Tool.saveConfig ( this.config, err => {
 					if ( err ) {
 						saveLog (`Tool.saveConfig return Error: [${ err.message }]`)
 					}
-					_callBack ()
+
+
 				})
 
 			}
@@ -580,7 +589,6 @@ export default class localServer {
 
 	}
 
-
 	constructor( private cmdResponse: ( cmd: QTGateAPIRequestCommand ) => void, test: boolean ) {
 		//Express.static.mime.define({ 'message/rfc822' : ['mhtml','mht'] })
 		//Express.static.mime.define ({ 'multipart/related' : ['mhtml','mht'] })

diff --git a/app/public/scripts/appsManager.js b/app/public/scripts/appsManager.js