aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/index.js
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lang/js/src/index.js46
1 files changed, 6 insertions, 40 deletions
diff --git a/lang/js/src/index.js b/lang/js/src/index.js
index 1b13ec4a..6db28733 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