Merge branch 'store_token_for_different_env' into v2.2.0

CHANGELOG.md

@@ -31,6 +31,9 @@
 ### 🎨 Interface
 - The gitlab token can be passed as secret user input in addition to the command line.
 
+### 🔨 Internal / Developers
+- Environment support added to CLI config file
+
 ### 📚 Documentation
 - Wiki update for this new version
 

NodeApp/src/config/LocalConfig.ts

 import * as fs             from 'fs';
-import logger          from '../shared/logging/WinstonLogger';
 import SessionManager      from '../managers/SessionManager';
 import Config              from './Config';
 import LocalConfigKeys     from '../types/LocalConfigKeys';
 import GitlabManager       from '../managers/GitlabManager';
 import JSON5               from 'json5';
+import ClientsSharedConfig from '../sharedByClients/config/ClientsSharedConfig';
 
 
 class LocalConfig {
@@ -24,23 +24,43 @@ class LocalConfig {
         try {
             this._config = JSON5.parse(fs.readFileSync(this.configPath).toString());
 
-            SessionManager.token = this._config.apiToken;
-            GitlabManager.token = this._config.gitlabPersonalToken;
-        } catch ( error ) { }
+            if ( LocalConfigKeys.API_TOKEN_ENV in this._config && ClientsSharedConfig.apiURL in this._config[LocalConfigKeys.API_TOKEN_ENV] ) {
+                SessionManager.token = this._config[LocalConfigKeys.API_TOKEN_ENV][ClientsSharedConfig.apiURL];
+            } else {
+                SessionManager.token = this._config[LocalConfigKeys.API_TOKEN];
+            }
+
+            GitlabManager.token = this._config[LocalConfigKeys.GITLAB_PERSONAL_TOKEN];
+        } catch ( error ) {
+            console.log(error);
+        }
     }
 
     updateConfig(key: LocalConfigKeys, value: any) {
-        if ( (this._config as any)[key] === value ) {
+        let previousValue = (this._config as any)[key];
+        if ( key === LocalConfigKeys.API_TOKEN && (!(LocalConfigKeys.API_TOKEN_ENV in this._config) || !(ClientsSharedConfig.apiURL in this._config[LocalConfigKeys.API_TOKEN_ENV])) ) {
+            previousValue = null;
+        }
+
+        if ( previousValue === value ) {
             return;
         }
 
+        if ( key === LocalConfigKeys.API_TOKEN ) {
+            delete (this._config as any)[LocalConfigKeys.API_TOKEN];
+
+            if ( !(LocalConfigKeys.API_TOKEN_ENV in this._config) ) {
+                (this._config as any)[LocalConfigKeys.API_TOKEN_ENV] = {};
+            }
+
+            (this._config as any)[LocalConfigKeys.API_TOKEN_ENV][ClientsSharedConfig.apiURL] = value;
+        } else {
             (this._config as any)[key] = value;
+        }
 
         try {
             fs.writeFileSync(this.configPath, JSON5.stringify(this._config, null, 4));
-        } catch ( error ) {
-            logger.error(error);
-        }
+        } catch ( error ) { }
     }
 }
 

NodeApp/src/types/LocalConfigKeys.ts

 enum LocalConfigKeys {
     API_TOKEN             = 'apiToken',
+    API_TOKEN_ENV         = 'apiTokenEnv',
     GITLAB_PERSONAL_TOKEN = 'gitlabPersonalToken',
 }