Straighten the method with guard clauses

reportportal · Sep 12, 2023 · 8b9d680 · 8b9d680
1 parent bd6a15a
commit 8b9d680
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/lib/commons/config.js b/lib/commons/config.js
@@ -18,18 +18,13 @@ const getRequiredOption = (options, optionName) => {
 };
 
 const getApiKey = ({ apiKey, token }) => {
-  let calculatedApiKey = apiKey;
-  if (!calculatedApiKey) {
-    calculatedApiKey = token;
-    if (!calculatedApiKey) {
-      throw new ReportPortalRequiredOptionError('apiKey');
-    } else {
-      console.warn(`Option 'token' is deprecated. Use 'apiKey' instead.`);
-    }
-  }
-
-  return calculatedApiKey;
-};
+  if (apiKey) return apiKey;  
+
+  if (!token) throw new ReportPortalRequiredOptionError('apiKey');
+
+  console.warn(`Option 'token' is deprecated. Use 'apiKey' instead.`);
+  return token;
+}
 
 const getClientConfig = (options) => {
   let calculatedOptions = options;