[git] GPGME - branch, javascript-binding, updated. gpgme-1.11.1-58-ge154554

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, javascript-binding has been updated
       via  e154554e9a48a08219649a58be0b641c561e1748 (commit)
      from  e97e6c06e950cfad424e120f4f3752b594214c94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e154554e9a48a08219649a58be0b641c561e1748
Author: Maximilian Krambach <[email protected]>
Date:   Mon Jun 11 15:10:43 2018 +0200

    js: removed config
    
    --
    
    * There is no use for a configuration at the moment, and it seems
      improbable that this use will arise.

diff --git a/lang/js/BrowserTestExtension/tests/inputvalues.js b/lang/js/BrowserTestExtension/tests/inputvalues.js
index 024aad2..1c70190 100644
--- a/lang/js/BrowserTestExtension/tests/inputvalues.js
+++ b/lang/js/BrowserTestExtension/tests/inputvalues.js
@@ -53,14 +53,6 @@ const inputvalues = {// eslint-disable-line no-unused-vars
             // bogus fingerprint)
             fingerprint: 'CDC3A2B2860625CCBFC5AAAAAC6D1B604967FC4A'
         }
-    },
-    init: {
-        // some parameters
-        invalid_startups: [
-            {all_passwords: true},
-            'openpgpmode',
-            {api_style:'frankenstein'}
-        ]
     }
 };
 
diff --git a/lang/js/BrowserTestExtension/tests/startup.js b/lang/js/BrowserTestExtension/tests/startup.js
index d434b6d..dae9402 100644
--- a/lang/js/BrowserTestExtension/tests/startup.js
+++ b/lang/js/BrowserTestExtension/tests/startup.js
@@ -22,7 +22,6 @@
  */
 
 /* global describe, it, expect, Gpgmejs */
-/* global inputvalues */
 
 describe('GPGME context', function(){
     it('Starting a GpgME instance', function(done){
@@ -36,19 +35,3 @@ describe('GPGME context', function(){
             });
     });
 });
-
-describe('GPGME does not start with invalid parameters', function(){
-    for (let i=0; i < inputvalues.init.invalid_startups.length; i++){
-        it('Parameter '+ i, function(done){
-            let prm = Gpgmejs.init(inputvalues.init.invalid_startups[i]);
-            prm.then(function(context){
-                expect(context).to.be.undefined;
-                done();
-            }, function(error){
-                expect(error).to.be.an.instanceof(Error);
-                expect(error.code).to.equal('PARAM_WRONG');
-                done();
-            });
-        });
-    }
-});
\ No newline at end of file
diff --git a/lang/js/src/Config.js b/lang/js/src/Config.js
deleted file mode 100644
index 8a3ef49..0000000
--- a/lang/js/src/Config.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* gpgme.js - Javascript integration for gpgme
- * Copyright (C) 2018 Bundesamt für Sicherheit in der Informationstechnik
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
- * SPDX-License-Identifier: LGPL-2.1+
- *
- * Author(s):
- *     Maximilian Krambach <[email protected]>
- */
-
-export const availableConf = {
-    null_expire_is_never: [true, false],
-    // cachedKeys: Some Key info will not be queried on each invocation,
-    // manual refresh by Key.refresh()
-    cachedKeys: [true, false]
-};
-
-export const defaultConf = {
-    null_expire_is_never: false,
-    cachedKeys: false
-};
\ No newline at end of file
diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 09bca7f..7fa7643 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -30,10 +30,8 @@ import { GPGME_Keyring } from './Keyring';
 export class GpgME {
     /**
      * initializes GpgME by opening a nativeMessaging port
-     * TODO: add configuration
      */
-    constructor(config){ //TODO config not parsed
-        this._config = config;
+    constructor(){
     }
 
     set Keyring(keyring){
diff --git a/lang/js/src/index.js b/lang/js/src/index.js
index 1b13ec4..6db2873 100644
--- a/lang/js/src/index.js
+++ b/lang/js/src/index.js
@@ -25,24 +25,20 @@
 import { GpgME } from './gpgmejs';
 import { gpgme_error } from './Errors';
 import { Connection } from './Connection';
-import { defaultConf, availableConf } from './Config';
 
 /**
- * Initializes a nativeMessaging Connection and returns a GPGMEjs object
- * @param {Object} config Configuration. See Config.js for available parameters.
- * Still TODO
+ * Tests nativeMessaging once and returns a GpgME object if successful.
+ * @returns {GpgME | Error}
+ *
+ * @async
  */
-function init(config){
-    let _conf = parseconfiguration(config);
-    if (_conf instanceof Error){
-        return Promise.reject(_conf);
-    }
+function init(){
     return new Promise(function(resolve, reject){
         let connection = new Connection;
         connection.checkConnection(false).then(
             function(result){
                 if (result === true) {
-                    resolve(new GpgME(_conf));
+                    resolve(new GpgME());
                 } else {
                     reject(gpgme_error('CONN_NO_CONNECT'));
                 }
@@ -52,36 +48,6 @@ function init(config){
     });
 }
 
-function parseconfiguration(rawconfig = {}){
-    if ( typeof(rawconfig) !== 'object'){
-        return gpgme_error('PARAM_WRONG');
-    }
-    let result_config = {};
-    let conf_keys = Object.keys(rawconfig);
-
-    for (let i=0; i < conf_keys.length; i++){
-
-        if (availableConf.hasOwnProperty(conf_keys[i])){
-            let value = rawconfig[conf_keys[i]];
-            if (availableConf[conf_keys[i]].indexOf(value) < 0){
-                return gpgme_error('PARAM_WRONG');
-            } else {
-                result_config[conf_keys[i]] = value;
-            }
-        }
-        else {
-            return gpgme_error('PARAM_WRONG');
-        }
-    }
-    let default_keys = Object.keys(defaultConf);
-    for (let j=0; j < default_keys.length; j++){
-        if (!result_config.hasOwnProperty(default_keys[j])){
-            result_config[default_keys[j]] = defaultConf[default_keys[j]];
-        }
-    }
-    return result_config;
-}
-
 export default {
     init: init
 };
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 lang/js/BrowserTestExtension/tests/inputvalues.js |  8 ----
 lang/js/BrowserTestExtension/tests/startup.js     | 17 ---------
 lang/js/src/Config.js                             | 34 -----------------
 lang/js/src/gpgmejs.js                            |  4 +-
 lang/js/src/index.js                              | 46 +++--------------------
 5 files changed, 7 insertions(+), 102 deletions(-)
 delete mode 100644 lang/js/src/Config.js


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
[email protected]
http://lists.gnupg.org/mailman/listinfo/gnupg-commits