@getjones/test-infra 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -8,10 +8,16 @@ const init = conf => {
     const accountsCore = require('./internal-api/accounts/core/accounts.core.setup');
     const accountsSettings = require('./internal-api/accounts/settings/settings.setup');
     const accountsOpenAPI = require('./internal-api/accounts/openapi/accounts.openapi.setup');
-
     const projects = require('./internal-api/projects/projects.setup');
 
-    const accounts = { accountsCore, accountsSettings, accountsOpenAPI, ...accountsCore };
+    const accounts = {
+        core: accountsCore,
+        settings: accountsSettings,
+        openAPI: accountsOpenAPI,
+        accountsCore,
+        accountsSettings,
+        accountsOpenAPI
+    };
 
     const internalAPI = { auth, accounts, projects };
     return { internalAPI };

package/src/internal-api/accounts/core/accounts.core.api.js

@@ -22,7 +22,7 @@ const updateAccountSettings = async (accountId, settings, context) => {
 
 const getByName = async (accountName, context) => {
     const params = { name: accountName };
-    return await requests.getRequestHandler(Endpoints.getAccount, params, context).then(res => res.data);
+    return requests.getRequestHandler(Endpoints.getAccount, params, context).then(res => res.data);
 };
 
 module.exports = { create, getByName, deleteAccount, updateAccountSettings };

package/src/internal-api/accounts/core/accounts.core.setup.js

@@ -53,7 +53,7 @@ const getAccountId = async (accountName, context) => {
     const account = await getAccount(accountName, context);
 
     if (!account) {
-        throw NotFoundError(`Account ${accountName} does not exist`);
+        throw new NotFoundError(`Account ${accountName} does not exist`);
     }
 
     return account.userId;

package/src/internal-api/accounts/openapi/accounts.openapi.api.js

@@ -2,11 +2,26 @@ const requests = require('../../common/requests');
 const { backendUrl } = require('../../../env').getEnv();
 
 const Endpoints = {
-    assignApiKey: accountId => `${backendUrl}/saas/accounts/${accountId}/api-keys`,
+    assignApiKey: `${backendUrl}/saas/api-keys`,
+    getApiKeyByAccountId: accountId => `${backendUrl}/saas/accounts/${accountId}/api-keys`,
+    getApiKeyDetails: `${backendUrl}/saas/api-keys`,
+    removeApiKey: `${backendUrl}/saas/api-keys`
 };
 
-const assignApiKey = async (accountId, data, context) => {
-    return requests.postRequestHandler(Endpoints.assignApiKey(accountId), data, context).then(res => res.data);
+const assignApiKey = async (data, context) => {
+    return requests.postRequestHandler(Endpoints.assignApiKey, data, context).then(res => res.data);
 };
 
-module.exports = { assignApiKey };
+const getApiKeyByAccountId = async (accountId, context) => {
+    return requests.getRequestHandler(Endpoints.getApiKeyByAccountId(accountId), {}, context).then(res => res.data);
+};
+
+const getApiKeyDetails = async (apiKeyValue, context) => {
+    return requests.getRequestHandler(Endpoints.getApiKeyDetails, { apiKeyValue }, context).then(res => res.data);
+};
+
+const deleteApiKey = async (data, context) => {
+    return requests.deleteRequestHandler(Endpoints.removeApiKey, context, {}, {}, data);
+};
+
+module.exports = { assignApiKey, getApiKeyByAccountId, getApiKeyDetails, deleteApiKey };

package/src/internal-api/accounts/openapi/accounts.openapi.setup.js

@@ -1,27 +1,37 @@
 const accountsAPI = require('./accounts.openapi.api');
-const { apiKey } = require('../../../../../../src/accounts/openapi/test.config');
 
-const assignApiKey = async (accountId, apiKey, context) => {
-    const data = { 'apiKey': apiKey };
-    return accountsAPI.assignApiKey(accountId, data, context);
+const assignApiKey = async (accountId, apiKeyValue, context) => {
+    const data = { apiKeyValue, accountId };
+    return accountsAPI.assignApiKey(data, context);
 };
 
 const getApiKeyByAccountId = async (accountId, context) => {
-
+    return accountsAPI.getApiKeyByAccountId(accountId, context);
 };
 
-const removeApiKey = async (accountId, context) => {
+const getApiKeyDetails = async (apiKeyValue, context) => {
+    return accountsAPI.getApiKeyDetails(apiKeyValue, context);
+};
 
+const deleteApiKey = async (apiKeyValue, context) => {
+    const data = { apiKeyValue };
+    return accountsAPI.deleteApiKey(data, context);
 };
 
 const getOrAssignApiKey = async (accountId, apiKey, context) => {
+    const existingApiKey = await getApiKeyByAccountId(accountId, context);
+
+    if (!existingApiKey.apiKey) {
+        return assignApiKey(accountId, apiKey, context);
+    }
 
+    return existingApiKey;
 };
 
 module.exports = {
     assignApiKey,
     getApiKeyByAccountId,
-    removeApiKey,
+    getApiKeyDetails,
+    deleteApiKey,
     getOrAssignApiKey
-};
-
+};

package/src/internal-api/common/requests.js

@@ -6,7 +6,8 @@ const getRequestHandler = async (url, params = {}, context = null, headers = {})
         const response = await axios.get(url, { params, headers });
         return response;
     } catch (error) {
-        throw Error(JSON.stringify(error.response.data));
+        const message = error.response.data && JSON.stringify(error.response.data) || error.message;
+        throw Error(message);
     }
 
 };
@@ -17,7 +18,8 @@ const postRequestHandler = async (url, body, context = null, headers = {}) => {
         const response = await axios.post(url, body, { headers });
         return response;
     } catch (error) {
-        throw Error(JSON.stringify(error.response.data));
+        const message = error.response.data && JSON.stringify(error.response.data) || error.message;
+        throw Error(message);
     }
 
 };
@@ -28,18 +30,20 @@ const putRequestHandler = async (url, body, context = null, headers = {}) => {
         const response = await axios.put(url, body, { headers });
         return response;
     } catch (error) {
-        throw Error(JSON.stringify(error.response.data));
+        const message = error.response.data && JSON.stringify(error.response.data) || error.message;
+        throw Error(message);
     }
 
 };
 
-const deleteRequestHandler = async (url, context = null, headers = {}, params = {}) => {
+const deleteRequestHandler = async (url, context = null, headers = {}, params = {}, data = {}) => {
     enrichCookie(headers, context);
     try {
-        const response = await axios.delete(url, { params, headers });
+        const response = await axios.delete(url, { params, headers, data });
         return response;
     } catch (error) {
-        throw Error(JSON.stringify(error.response.data));
+        const message = error.response.data && JSON.stringify(error.response.data) || error.message;
+        throw Error(message);
     }
 
 };