@contentstack/marketplace-sdk 1.2.6 → 1.2.8

package/.husky/pre-commit

@@ -0,0 +1,69 @@
+#!/usr/bin/env sh
+# Pre-commit hook to run Snyk and Talisman scans, completing both before deciding to commit
+
+# Function to check if a command exists
+command_exists() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+# Check if Snyk is installed
+if ! command_exists snyk; then
+  echo "Error: Snyk is not installed. Please install it and try again."
+  exit 1
+fi
+
+# Check if Talisman is installed
+if ! command_exists talisman; then
+  echo "Error: Talisman is not installed. Please install it and try again."
+  exit 1
+fi
+
+# Allow bypassing the hook with an environment variable
+if [ "$SKIP_HOOK" = "1" ]; then
+  echo "Skipping Snyk and Talisman scans (SKIP_HOOK=1)."
+  exit 0
+fi
+
+# Initialize variables to track scan results
+snyk_failed=false
+talisman_failed=false
+
+# Run Snyk vulnerability scan
+echo "Running Snyk vulnerability scan..."
+snyk test --all-projects > snyk_output.log 2>&1
+snyk_exit_code=$?
+
+if [ $snyk_exit_code -eq 0 ]; then
+  echo "Snyk scan passed: No vulnerabilities found."
+elif [ $snyk_exit_code -eq 1 ]; then
+  echo "Snyk found vulnerabilities. See snyk_output.log for details."
+  snyk_failed=true
+else
+  echo "Snyk scan failed with error (exit code $snyk_exit_code). See snyk_output.log for details."
+  snyk_failed=true
+fi
+
+# Run Talisman secret scan (continues even if Snyk failed)
+echo "Running Talisman secret scan..."
+talisman --githook pre-commit > talisman_output.log 2>&1
+talisman_exit_code=$?
+
+if [ $talisman_exit_code -eq 0 ]; then
+  echo "Talisman scan passed: No secrets found."
+else
+  echo "Talisman scan failed (exit code $talisman_exit_code). See talisman_output.log for details."
+  talisman_failed=true
+fi
+
+# Evaluate results after both scans
+if [ "$snyk_failed" = true ] || [ "$talisman_failed" = true ]; then
+  echo "Commit aborted due to issues found in one or both scans."
+  [ "$snyk_failed" = true ] && echo "- Snyk issues: Check snyk_output.log"
+  [ "$talisman_failed" = true ] && echo "- Talisman issues: Check talisman_output.log"
+  exit 1
+fi
+
+# If both scans pass, allow the commit
+echo "All scans passed. Proceeding with commit.cd ."
+rm -f snyk_output.log talisman_output.log
+exit 0

package/CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## [v1.2.8](https://github.com/contentstack/contentstack-marketplace-sdk/tree/v1.2.6) (2024-05-26)
+ - Fix: Added params support to getInstalledApps method for enhanced flexibility
+
+## [v1.2.7](https://github.com/contentstack/contentstack-marketplace-sdk/tree/v1.2.6) (2024-05-15)
+ - Fixed base URL path logic in contentstackClient to handle when region and host not provided
+
 ## [v1.2.6](https://github.com/contentstack/contentstack-marketplace-sdk/tree/v1.2.6) (2024-03-03)
  - Update sanity tests
 

package/dist/es-modules/contentstackClient.js

@@ -6,6 +6,7 @@ import error from './core/contentstackError';
 import { Marketplace } from './marketplace/index.js';
 import { Region } from './contentstack.js';
 export default function contentstackClient(_ref) {
+  var _http$defaults;
   var http = _ref.http;
   /**
    * @description The login call is used to sign in to your Contentstack account and obtain the authtoken.
@@ -30,6 +31,10 @@ export default function contentstackClient(_ref) {
   var baseUrlPath = "/user-session";
   if (region && region !== Region.NA) {
     baseUrlPath = "https://".concat(region, "-api.contentstack.com:443/v3/user-session");
+  } else if (!region && http !== null && http !== void 0 && (_http$defaults = http.defaults) !== null && _http$defaults !== void 0 && _http$defaults.host) {
+    baseUrlPath = "https://".concat(http.defaults.host, ":443/v3/user-session");
+  } else {
+    baseUrlPath = "https://api.contentstack.io:443/v3/user-session";
   }
   function login(requestBody) {
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/dist/es-modules/marketplace/installation/index.js

@@ -439,37 +439,42 @@ export function Installation(http, data) {
        *
        */
       this.getInstalledApps = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
-        var headers, response;
+        var param,
+          headers,
+          response,
+          _args7 = arguments;
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context7.prev = 0;
+              param = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
+              _context7.prev = 1;
               headers = {
-                headers: _objectSpread({}, cloneDeep(params))
-              } || {};
-              _context7.next = 4;
+                headers: _objectSpread({}, cloneDeep(params)),
+                params: _objectSpread({}, cloneDeep(param))
+              };
+              _context7.next = 5;
               return http.get("".concat(_this.urlPath, "/view/apps"), headers);
-            case 4:
+            case 5:
               response = _context7.sent;
               if (!response.data) {
-                _context7.next = 9;
+                _context7.next = 10;
                 break;
               }
               return _context7.abrupt("return", response.data);
-            case 9:
-              throw error(response);
             case 10:
-              _context7.next = 15;
+              throw error(response);
+            case 11:
+              _context7.next = 16;
               break;
-            case 12:
-              _context7.prev = 12;
-              _context7.t0 = _context7["catch"](0);
+            case 13:
+              _context7.prev = 13;
+              _context7.t0 = _context7["catch"](1);
               throw error(_context7.t0);
-            case 15:
+            case 16:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, null, [[0, 12]]);
+        }, _callee7, null, [[1, 13]]);
       }));
 
       /**

package/dist/es5/contentstackClient.js

@@ -15,6 +15,7 @@ var _contentstack = require("./contentstack.js");
  */
 
 function contentstackClient(_ref) {
+  var _http$defaults;
   var http = _ref.http;
   /**
    * @description The login call is used to sign in to your Contentstack account and obtain the authtoken.
@@ -39,6 +40,10 @@ function contentstackClient(_ref) {
   var baseUrlPath = "/user-session";
   if (region && region !== _contentstack.Region.NA) {
     baseUrlPath = "https://".concat(region, "-api.contentstack.com:443/v3/user-session");
+  } else if (!region && http !== null && http !== void 0 && (_http$defaults = http.defaults) !== null && _http$defaults !== void 0 && _http$defaults.host) {
+    baseUrlPath = "https://".concat(http.defaults.host, ":443/v3/user-session");
+  } else {
+    baseUrlPath = "https://api.contentstack.io:443/v3/user-session";
   }
   function login(requestBody) {
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/dist/es5/marketplace/installation/index.js

@@ -452,37 +452,42 @@ function Installation(http, data) {
        *
        */
       this.getInstalledApps = /*#__PURE__*/(0, _asyncToGenerator3["default"])(/*#__PURE__*/_regenerator2["default"].mark(function _callee7() {
-        var headers, response;
+        var param,
+          headers,
+          response,
+          _args7 = arguments;
         return _regenerator2["default"].wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context7.prev = 0;
+              param = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
+              _context7.prev = 1;
               headers = {
-                headers: _objectSpread({}, (0, _cloneDeep2["default"])(params))
-              } || {};
-              _context7.next = 4;
+                headers: _objectSpread({}, (0, _cloneDeep2["default"])(params)),
+                params: _objectSpread({}, (0, _cloneDeep2["default"])(param))
+              };
+              _context7.next = 5;
               return http.get("".concat(_this.urlPath, "/view/apps"), headers);
-            case 4:
+            case 5:
               response = _context7.sent;
               if (!response.data) {
-                _context7.next = 9;
+                _context7.next = 10;
                 break;
               }
               return _context7.abrupt("return", response.data);
-            case 9:
-              throw (0, _contentstackError2["default"])(response);
             case 10:
-              _context7.next = 15;
+              throw (0, _contentstackError2["default"])(response);
+            case 11:
+              _context7.next = 16;
               break;
-            case 12:
-              _context7.prev = 12;
-              _context7.t0 = _context7["catch"](0);
+            case 13:
+              _context7.prev = 13;
+              _context7.t0 = _context7["catch"](1);
               throw (0, _contentstackError2["default"])(_context7.t0);
-            case 15:
+            case 16:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, null, [[0, 12]]);
+        }, _callee7, null, [[1, 13]]);
       }));
 
       /**