Merge pull request #1052 from calimero-is-near/use_middleware_to_set_…

…apkikey

fix: move x-api-key logic to middlewares

bin/near-cli.js

@@ -240,6 +240,7 @@ yargs // eslint-disable-line
     .middleware(require('../middleware/ledger'))
     .middleware(require('../middleware/abi'))
     .middleware(require('../middleware/seed-phrase'))
+    .middleware(require('../middleware/x-api-key'))
     .command(require('../commands/create-account').createAccountCommand)
     .command(require('../commands/create-account').createAccountCommandDeprecated)
     .command(viewAccount)

config.js

@@ -1,5 +1,3 @@
-const { getXApiKey } = require('./utils/x-api-key-settings.js');
-
 const CONTRACT_NAME = process.env.CONTRACT_NAME;
 
 function getConfig(env) {
@@ -86,12 +84,6 @@ function getConfig(env) {
     default:
         throw Error(`Unconfigured environment '${env}'. Can be configured in src/config.js.`);
     }
-
-    // adding x-api-key for given RPC Server
-    const apiKey = getXApiKey(config.nodeUrl);
-    if (apiKey) {
-        config.headers = { 'x-api-key': apiKey };
-    }
     return config;
 }
 

middleware/x-api-key.js

@@ -0,0 +1,9 @@
+const { getXApiKey } = require('../utils/x-api-key-settings');
+
+module.exports = async function setNodeXApiKey(options) {
+    const apiKey = getXApiKey(options.nodeUrl);
+    if (apiKey) {
+        options.headers = { 'x-api-key': apiKey };
+    }
+    return options;
+};