Merge pull request #8 from dannycoates/keys

Added test.json config file and public/secret keys

lib/config.js

@@ -119,18 +119,6 @@ if (process.env.CONFIG_FILES) {
 // set the public url as the issuer domain for assertions
 conf.set('domain', url.parse(conf.get('public_url')).host);
 
-if (conf.get('env') === 'test') {
-  if (conf.get('kvstore.backend') === 'mysql' || conf.get('kvstore.cache') === 'mysql') {
-    conf.set('mysql.database', 'test');
-  }
-}
-
-const configDir = fs.realpathSync(__dirname + "/../config");
-const pubKeyFile = configDir + "/public-key.json";
-const secretKeyFile = configDir + "/secret-key.json";
-conf.set('secretKeyFile', secretKeyFile);
-conf.set('publicKeyFile', pubKeyFile);
-
 conf.validate();
 
 console.log('configuration: ', conf.toString());

package.json

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "scripts": {
-    "test": "NODE_ENV=test ./node_modules/.bin/mocha -R spec --recursive --timeout 10000",
+    "test": "CONFIG_FILES=./test/config/test.json ./node_modules/.bin/mocha -R spec --recursive --timeout 10000",
     "start": "NODE_ENV=local node index.js"
   },
   "repository": "",

test/config/public-key.json

@@ -0,0 +1 @@
+{"algorithm":"DS","y":"93356c431dd325095b91d9a2f8654d0a09528a52da5d4915591ccb7a3de8bd991417eff74682448eb08f5e5e6e85402166d87c794da6e33a4b36d4590b70a7d2b56f5567dabb38f4cde3e019930ad68debb52588d4f6bc5f22ad7cca56eb254c9604cbaccc07ab20d8abe740b4ccbad0818ed6146ca11394fa2dc6e22ee645238631fba01abd93a379ed92fe16a4dc6239b4932d141f28e38b8d6691cae1242441cf6f6fd7d831eacb9dfa7c46c80c3ea03dfc6a26bd6845541ffadd3a4b72f5afea18d0f99c639bba68653669e98d99cd8c5e196f684647547bde993f669029dc94c88b90be6847851a55f56d8edc7b0efe7fdae2043ccc33ef00c63e094d08","p":"d6c4e5045697756c7a312d02c2289c25d40f9954261f7b5876214b6df109c738b76226b199bb7e33f8fc7ac1dcc316e1e7c78973951bfc6ff2e00cc987cd76fcfb0b8c0096b0b460fffac960ca4136c28f4bfb580de47cf7e7934c3985e3b3d943b77f06ef2af3ac3494fc3c6fc49810a63853862a02bb1c824a01b7fc688e4028527a58ad58c9d512922660db5d505bc263af293bc93bcd6d885a157579d7f52952236dd9d06a4fc3bc2247d21f1a70f5848eb0176513537c983f5a36737f01f82b44546e8e7f0fabc457e3de1d9c5dba96965b10a2a0580b0ad0f88179e10066107fb74314a07e6745863bc797b7002ebec0b000a98eb697414709ac17b401","q":"b1e370f6472c8754ccd75e99666ec8ef1fd748b748bbbc08503d82ce8055ab3b","g":"9a8269ab2e3b733a5242179d8f8ddb17ff93297d9eab00376db211a22b19c854dfa80166df2132cbc51fb224b0904abb22da2c7b7850f782124cb575b116f41ea7c4fc75b1d77525204cd7c23a15999004c23cdeb72359ee74e886a1dde7855ae05fe847447d0a68059002c3819a75dc7dcbb30e39efac36e07e2c404b7ca98b263b25fa314ba93c0625718bd489cea6d04ba4b0b7f156eeb4c56c44b50e4fb5bce9d7ae0d55b379225feb0214a04bed72f33e0664d290e7c840df3e2abb5e48189fa4e90646f1867db289c6560476799f7be8420a6dc01d078de437f280fff2d7ddf1248d56e1a54b933a41629d6c252983c58795105802d30d7bcd819cf6ef"}

test/config/secret-key.json

@@ -0,0 +1 @@
+{"algorithm":"DS","x":"93aaf96c1ff1f2819f7e6c1a6d4cf03c7aa5021124bd8bc7423338fed98a0830","p":"d6c4e5045697756c7a312d02c2289c25d40f9954261f7b5876214b6df109c738b76226b199bb7e33f8fc7ac1dcc316e1e7c78973951bfc6ff2e00cc987cd76fcfb0b8c0096b0b460fffac960ca4136c28f4bfb580de47cf7e7934c3985e3b3d943b77f06ef2af3ac3494fc3c6fc49810a63853862a02bb1c824a01b7fc688e4028527a58ad58c9d512922660db5d505bc263af293bc93bcd6d885a157579d7f52952236dd9d06a4fc3bc2247d21f1a70f5848eb0176513537c983f5a36737f01f82b44546e8e7f0fabc457e3de1d9c5dba96965b10a2a0580b0ad0f88179e10066107fb74314a07e6745863bc797b7002ebec0b000a98eb697414709ac17b401","q":"b1e370f6472c8754ccd75e99666ec8ef1fd748b748bbbc08503d82ce8055ab3b","g":"9a8269ab2e3b733a5242179d8f8ddb17ff93297d9eab00376db211a22b19c854dfa80166df2132cbc51fb224b0904abb22da2c7b7850f782124cb575b116f41ea7c4fc75b1d77525204cd7c23a15999004c23cdeb72359ee74e886a1dde7855ae05fe847447d0a68059002c3819a75dc7dcbb30e39efac36e07e2c404b7ca98b263b25fa314ba93c0625718bd489cea6d04ba4b0b7f156eeb4c56c44b50e4fb5bce9d7ae0d55b379225feb0214a04bed72f33e0664d290e7c840df3e2abb5e48189fa4e90646f1867db289c6560476799f7be8420a6dc01d078de437f280fff2d7ddf1248d56e1a54b933a41629d6c252983c58795105802d30d7bcd819cf6ef"}

test/config/test.json

@@ -0,0 +1,11 @@
+{
+  "env": "test",
+  "secretKeyFile": "./test/config/secret-key.json",
+  "publicKeyFile": "./test/config/public-key.json",
+  "kvstore": {
+    "backend": "memory"
+  },
+  "mysql": {
+    "database": "test"
+  }
+}