removed secret type per instance since the choosen one is always

accessToken

wip #240

Author: raffis

app/i18n/de-CH.json

@@ -82,11 +82,6 @@
   "startup.welcome.advanced": "Erweiterte Einstellungen",
   "startup.advanced.saveDir.title": "balloon-Verzeichnis",
   "startup.advanced.saveDir.message": "Den Speicherort für deinen balloon ändern:",
-  "startup.auth.username": "Benutzername",
-  "startup.auth.password": "Passwort",
-  "startup.auth.mfaCode": "Code",
-  "startup.auth.mfaDescription": "Dieses Konto ist mit multi factor authentication geschützt. Bitte gib den Code vom google authenticator ein:",
-  "startup.auth.message": "Melde dich bei deinem balloon an:",
   "startup.selective.edit": "Selektion anpassen",
   "startup.selective.message": "Freigaben werden standardmässig nicht synchronisiert und müssen separat in der Selektiven Synchronisation aktiviert werden.",
   "startup.clientInitiatedLogoutWarning.title": "Account getrennt",
@@ -131,8 +126,6 @@
   "error.blnUrl.offline": "Der balloon-Server kann nicht erreicht werden. Bitte stelle sicher, dass eine Internetverbindung besteht.",
   "error.auth": "Authentifizierungs Fehler",
   "error.auth.network_server_error": "Der Server kann nicht erreicht werden, oder hat eine Störung. Bitte versuche es später nochmals.",
-  "error.auth.credentials": "Authentifizierung fehlgeschlagen",
-  "error.auth.mfaNotToken": "Der gewählte Account hat Multi Faktor Authentifizierung (MFA) aktiviert. MFA wird nur mit dem Login Flow \"token\" unterstüzt.",
   "error.auth.oidc": "Die Authentifizierung mit dem ausgewählten Identity Provider ist fehlgeschlagen.",
   "error.auth.filesystem": "Das Balloon Verzeichniss konnte nicht erstellt werden. Bitte stelle sicher, das nicht bereits ein Verzeichnis besteht, und Balloon Schreibrechte hat.",
   "error.auth.filesystem.path": "Pfad zum Balloon Verzeichnis: %s",

app/i18n/en-US.json

@@ -82,11 +82,6 @@
   "startup.welcome.advanced": "Advanced Settings",
   "startup.advanced.saveDir.title": "balloon directory",
   "startup.advanced.saveDir.message": "Change the directory for your balloon:",
-  "startup.auth.username": "Username",
-  "startup.auth.password": "Password",
-  "startup.auth.mfaCode": "Code",
-  "startup.auth.mfaDescription": "Your account has been protected with multi factor authentication. Please enter the code from your google authenticator:",
-  "startup.auth.message": "Authenticate your account with balloon:",
   "startup.selective.edit": "Change selection",
   "startup.selective.message": "Shares are not synced by default and need to be activated separately in the selective synchronisation.",
   "startup.clientInitiatedLogoutWarning.title": "Account unlinked",
@@ -131,9 +126,7 @@
   "error.blnUrl.offline": "It looks like the balloon server can not be reached. Please make sure you have a valid internet connection.",
   "error.auth": "Authentication error",
   "error.auth.network_server_error": "The server can not be reached or it has a temporary error. Please try again later",
-  "error.auth.credentials": "Authentication failed",
-  "error.auth.mfaNotToken": "The choosen account multi factor authentication (MFA) activated. MFA is only supported with the login flow \"token\".",
-  "error.auth.oidc": "There was an error authenticating your account with the choosen identity provider.",
+  "error.auth.oidc": "There was an error authenticating your account with the identity provider.",
   "error.auth.filesystem": "The balloon directory could not be created. Please make sure, there is no existing directory and that balloon has write access.",
   "error.auth.filesystem.path": "Path to the balloon directory: %s",
 

app/lib/auth/controller.js

@@ -41,7 +41,7 @@ module.exports = function(env, clientConfig) {
 
         var promises = [];
 
-        promises.push(clientConfig.destroySecret(clientConfig.getSecretType()));
+        promises.push(clientConfig.destroySecret('accessToken'));
 
         if(excludeRefreshToken !== true) {
          promises.push(clientConfig.destroySecret('refreshToken'));
@@ -133,7 +133,7 @@ module.exports = function(env, clientConfig) {
 
   function retrieveLoginSecret() {
     return new Promise(function(resolve) {
-      clientConfig.retrieveSecret(clientConfig.getSecretType()).then((secret) => {
+      clientConfig.retrieveSecret('accessToken').then((secret) => {
         clientConfig.setSecret(secret)
         resolve();
       }).catch((error) => {

app/lib/config.js

@@ -85,7 +85,7 @@ function initialize(syncMemory, mainSync) {
       settings.setAll(newSettings);
       if(syncMemory) {
         for(key in memorySettings) {
-          if(env.auth && env.auth.secretStorage === 'config' || (key !== 'password' && key !== 'accessToken') ) {
+          if(env.auth && env.auth.secretStorage === 'config' || (key !== 'accessToken') ) {
             settings.set(key, memorySettings[key]);
           }
         }
@@ -98,26 +98,6 @@ function initialize(syncMemory, mainSync) {
 
 module.exports = function() {
   initialize();
-
-  function getSecretType() {
-    var method;
-    if(activeInstance) {
-      method = settings.get('authMethod');
-    } else {
-      method = memorySettings['authMethod'];
-    }
-
-    switch(method) {
-      case 'basic':
-        return 'password';
-      break;
-      case 'token':
-      case 'oidc':
-        return 'accessToken';
-      break;
-    }
-  }
-
   var secret, traySecretUpdate;
 
   function set(key, value) {
@@ -159,8 +139,8 @@ module.exports = function() {
         var conf = memorySettings;
       }
 
-      if(include_secret === true && getSecretType()) {
-        conf[getSecretType()] = secret;
+      if(include_secret === true) {
+        conf.accessToken = secret;
       }
 
       return conf;
@@ -200,7 +180,6 @@ module.exports = function() {
     getSecret: function() {
       return secret;
     },
-    getSecretType,
     hasSecret: function() {
       if(secret === undefined) {
         return false;
@@ -209,7 +188,7 @@ module.exports = function() {
       }
     },
     destroySecret: function(type) {
-      if(getSecretType() === type) {
+      if('accessToken' === type) {
         secret = undefined;
         traySecretUpdate();
       }
@@ -223,7 +202,7 @@ module.exports = function() {
       }
     },
     storeSecret: function(type, key) {
-      if(getSecretType() === type) {
+      if('accessToken' === type) {
         secret = key;
         traySecretUpdate();
       }

app/lib/sync/browser.js

@@ -17,9 +17,11 @@ try {
   var syncCompleted = false;
 
   ipcRenderer.send('sync-window-loaded');
-  ipcRenderer.once('secret', function(event, type, secret) {
+  ipcRenderer.once('secret', function(event, secret) {
     var config = clientConfig.getAll(true);
-    config[type] = secret;
+    config.accessToken = secret;
+    //TODO backwards compatibility
+    config.authMethod = 'oidc';
     config.version = globalConfig.get('version');
 
     if(env.sync && env.sync.maxConcurentConnections) {

app/lib/sync/controller.js

@@ -173,7 +173,7 @@ module.exports = function(env, tray) {
         });
 
         ipcMain.once('sync-window-loaded', function(){
-          fullSyncWindow.webContents.send('secret', clientConfig.getSecretType(), clientConfig.getSecret());
+          fullSyncWindow.webContents.send('secret', clientConfig.getSecret());
         });
 
         var syncCompleteListener = function(event, err) {
@@ -354,7 +354,7 @@ module.exports = function(env, tray) {
   function updateSelectiveSync(difference, callback) {
     pause(true).then(result => {
       let config = clientConfig.getAll();
-      config[clientConfig.getSecretType()] = clientConfig.getSecret();
+      config.accessToken = clientConfig.getSecret();
       config.version = globalConfig.get('version');
 
       const sync = fullSyncFactory(config, logger.getLogger());
@@ -375,7 +375,7 @@ module.exports = function(env, tray) {
   function ignoreNewShares(callback) {
     pause(true).then(result => {
       let config = clientConfig.getAll();
-      config[clientConfig.getSecretType()] = clientConfig.getSecret();
+      config.accessToken = clientConfig.getSecret();
       config.version = globalConfig.get('version');
 
       const sync = fullSyncFactory(config, logger.getLogger());

app/ui/selective/browser.js

@@ -42,9 +42,9 @@ $('document').ready(function() {
 
   ipcRenderer.send('selective-window-loaded');
 
-  ipcRenderer.once('secret', function(event, type, secret) {
+  ipcRenderer.once('secret', function(event, secret) {
     var config = clientConfig.getAll(true);
-    config[type] = secret;
+    config.accessToken = secret;
     config.version = globalConfig.get('version');
 
     initialize(config);

app/ui/selective/controller.js

@@ -36,7 +36,7 @@ module.exports = function(env, clientConfig) {
 
     //TODO pixtron - is it possible to have a generic "request secret method?"
     ipcMain.on('selective-window-loaded',function(){
-      selectiveWindow.webContents.send('secret', clientConfig.getSecretType(), clientConfig.getSecret());
+      selectiveWindow.webContents.send('secret', clientConfig.getSecret());
 
       if(applyActive === true) selectiveWindow.webContents.executeJavaScript(`isUpdateing()`);
     });

app/ui/tray/browser.js

@@ -120,12 +120,12 @@ ipcRenderer.on('tray-load-menu' , function(event, menu) {
 });
 
 ipcRenderer.send('tray-window-loaded');
-ipcRenderer.on('config', function(event, secret, secretType) {
-  logger.info('got config', {category: 'tray-browser', secretType});
+ipcRenderer.on('config', function(event, secret) {
+  logger.info('got config', {category: 'tray-browser'});
 
   clientConfig.initialize(false);
   var config = clientConfig.getAll();
-  config[secretType] = secret;
+  config.accessToken = secret;
   config.version = globalConfig.get('version');
 
   if(!clientConfig.get('loggedin') || !clientConfig.isActiveInstance()) {

app/ui/tray/controller.js

@@ -326,7 +326,9 @@ module.exports = function(env, clientConfig) {
 
     const menu = menuFactory(loadMenu, clientConfig, showLogin, syncStatus)
 
-    tray.setContextMenu(menu);
+    if(tray) {
+      tray.setContextMenu(menu);
+    }
   }
 
   function emit(key, message) {
@@ -350,7 +352,7 @@ module.exports = function(env, clientConfig) {
 
   function updateSecret() {
     showLogin = (!clientConfig.get('loggedin') || !clientConfig.isActiveInstance())
-    trayWindow.webContents.send('config', clientConfig.getSecret(), clientConfig.getSecretType());
+    trayWindow.webContents.send('config', clientConfig.getSecret());
     updateTrayMenu()
   }