@sudoplatform/sudo-common 6.4.0 → 7.0.2

package/.gitignore

@@ -10,4 +10,5 @@ yarn-error.log
 coverage
 .yalc/
 yalc.lock
-config
+config
+package.json.old

package/.yarn/releases/{yarn-1.22.18.cjs → yarn-1.22.19.cjs}

@@ -1565,7 +1565,13 @@ class ResponseError extends Error {
 }
 
 exports.ResponseError = ResponseError;
-class OneTimePasswordError extends Error {}
+class OneTimePasswordError extends Error {
+  constructor(notice) {
+    super();
+    this.notice = notice;
+  }
+
+}
 exports.OneTimePasswordError = OneTimePasswordError;
 
 /***/ }),
@@ -32867,6 +32873,10 @@ class NpmRegistry extends (_baseRegistry || _load_baseRegistry()).default {
           }
 
           _this.reporter.info(_this.reporter.lang('twoFactorAuthenticationEnabled'));
+          if (error.notice) {
+            _this.reporter.info(error.notice);
+          }
+
           _this.otp = yield (0, (_login || _load_login()).getOneTimePassword)(_this.reporter);
 
           _this.requestManager.clearCache();
@@ -46853,7 +46863,7 @@ function mkdirfix (name, opts, cb) {
 /* 195 */
 /***/ (function(module, exports) {
 
-module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.18","packageManager":"yarn@1.22.17","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.19","packageManager":"yarn@1.22.17","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
 /* 196 */
@@ -77655,9 +77665,8 @@ class RequestManager {
 
         if (res.statusCode === 401 && res.headers['www-authenticate']) {
           const authMethods = res.headers['www-authenticate'].split(/,\s*/).map(s => s.toLowerCase());
-
           if (authMethods.indexOf('otp') !== -1) {
-            reject(new (_errors || _load_errors()).OneTimePasswordError());
+            reject(new (_errors || _load_errors()).OneTimePasswordError(res.headers['npm-notice']));
             return;
           }
         }

package/.yarnrc

@@ -2,4 +2,4 @@
 # yarn lockfile v1
 
 
-yarn-path ".yarn/releases/yarn-1.22.18.cjs"
+yarn-path ".yarn/releases/yarn-1.22.19.cjs"

package/bin/outdated-with-suppression.sh

@@ -1,12 +1,15 @@
 #!/bin/sh
 
-function version_diff_type() {
+set -e
+d="$(dirname "$0")"
+
+version_diff_type() {
   v1="$1"
   v2="$2"
-  v1_major=$(echo $v1 | sed -E -e 's/^([^.]+)\..*/\1/')
-  v2_major=$(echo $v2 | sed -E -e 's/^([^.]+)\..*/\1/')
-  v1_minor=$(echo $v1 | sed -E -e 's/^([^.]+)\.([^.]+)\..*/\2/')
-  v2_minor=$(echo $v2 | sed -E -e 's/^([^.]+)\.([^.]+)\..*/\2/')
+  v1_major=$(echo "$v1" | sed -E -e 's/^([^.]+)\..*/\1/')
+  v2_major=$(echo "$v2" | sed -E -e 's/^([^.]+)\..*/\1/')
+  v1_minor=$(echo "$v1" | sed -E -e 's/^([^.]+)\.([^.]+)\..*/\2/')
+  v2_minor=$(echo "$v2" | sed -E -e 's/^([^.]+)\.([^.]+)\..*/\2/')
   if [ "${v1_major}" != "${v2_major}" ]; then echo 'major'; return 0; fi
   if [ "${v1_minor}" != "${v2_minor}" ]; then echo 'minor'; return 0; fi
   if [ "${v1}" != "${v2}" ]; then echo 'patch'; return 0; fi
@@ -14,7 +17,7 @@ function version_diff_type() {
   return 0
 }
 
-function suppression_from_diff_type() {
+suppression_from_diff_type() {
   diff_type="$1"
   majorSuppression="$2"
   minorSuppression="$3"
@@ -45,17 +48,92 @@ function suppression_from_diff_type() {
   esac
 }
 
-yarn outdated --json | jq -r -s -c 'map(select(.type == "table").data.body) | .[] | unique_by(.[0]) | .[] | .[0] + " " + .[1] + " " + .[2] + " " + .[3]' | (new=""; while read package_name current wanted latest; do
+# Number of days to suppress if accepting or refreshing and cadence to run if --last specified
+cadence=30
+
+# If set, accept any outdated packages. Has the effect of refreshing existing suppressions
+# as well.
+accept=""
+
+# If set, refresh any existing suppressions
+refresh=""
+
+# If set, records/references last success in the specified directory.
+# Only run the dependency check every cadence days if a last success
+# timestamp is found
+last=""
+
+while [ -n "${1}" ]; do
+  case "${1}" in
+    --cadence)
+      if [ -z "$2" ]; then
+        echo "ERROR: --cadence requires number of days argument" 1>&2
+        exit 1
+      fi
+      shift
+      cadence="$1"
+      ;;
+    --accept) accept="1" ;;
+    --refresh) refresh="1" ;;
+    --last)
+      if [ -z "$2" ]; then
+        echo "ERROR: --last requires directory argument in which last successful run timestamp is to be store" 1>&2
+        exit 1
+      fi
+      shift
+      last="$1"
+      ;;
+    *)
+      echo "ERROR: Unrecognized argument '${1}'" 1>&2
+      exit 1
+  esac
+  shift
+done
+
+dateFromSeconds() {
+  s="$1"
+  case $(uname) in
+    Darwin)
+      date -Iseconds -r"${s}"
+      ;;
+    *)
+      date -Iseconds "-d@${s}"
+      ;;
+  esac
+}
+
+within_cadence=""
+if [ -r "${last}/last_success" ]; then
+  cadence_seconds=$((cadence * 24 * 3600))
+  now="$(date +%s)"
+  last_run="$(cat "${last}/last_success")"
+  due="$((last_run + cadence_seconds))"
+  if [ "$((due > now))" = "1" ]; then
+    echo "Last success: $(dateFromSeconds "${last_run}")"
+    echo "Now:          $(date -Iseconds)"
+    echo "Due from:     $(dateFromSeconds "${due}")"
+    within_cadence="1"
+  else
+    echo "Last success: $(dateFromSeconds "${last_run}")"
+    echo "Now:          $(date -Iseconds)"
+    echo "Due since:    $(dateFromSeconds "${due}")"
+  fi
+fi
+
+
+yarn outdated --json | jq -r -s -c 'map(select(.type == "table").data.body) | .[] | unique_by(.[0]) | .[] | .[0] + " " + .[1] + " " + .[2] + " " + .[3]' | (new=""; while read -r package_name current wanted latest; do
   majorSuppression=$(jq ".outdatedSuppressions.major[\"${package_name}\"] | select (. != null)" package.json)
   minorSuppression=$(jq ".outdatedSuppressions.minor[\"${package_name}\"] | select (. != null)" package.json)
   patchSuppression=$(jq ".outdatedSuppressions[\"${package_name}\"] | select (. != null)" package.json)
   latest_diff_type=$(version_diff_type "${current}" "${latest}")
   wanted_diff_type=$(version_diff_type "${current}" "${wanted}")
 
+  # shellcheck disable=SC2046
   set -- $(suppression_from_diff_type "${latest_diff_type}" "${majorSuppression}" "${minorSuppression}" "${patchSuppression}")
   latest_suppression_type="$1"
   latest_suppression="$2"
 
+  # shellcheck disable=SC2046
   set -- $(suppression_from_diff_type "${wanted_diff_type}" "${majorSuppression}" "${minorSuppression}" "${patchSuppression}")
   wanted_suppression_type="$1"
   wanted_suppression="$2"
@@ -81,17 +159,45 @@ yarn outdated --json | jq -r -s -c 'map(select(.type == "table").data.body) | .[
     fi
   fi
 
+  suppress_outdated=""
+  if [ -e "${d}/suppress-outdated" ]; then
+    suppress_outdated="${d}/suppress-outdated"
+  elif [ -e "${d}/suppress-outdated.sh" ]; then
+    suppress_outdated="${d}/suppress-outdated.sh"
+  fi
+  if [ -z "${suppress_outdated}" ]; then
+    echo "ERROR: Unable to find suppress-outdated" 1>&2
+    exit 1
+  fi
   if [ -z "${suppression}" ]; then
-    echo "${package_name}: current: ${current} wanted: ${wanted} latest: ${latest} [${outdated_diff_type} outdated]"
-    new=1
-  elif [ $(date '+%s') -gt "${suppression}" ]; then
+    if [ -n "${accept}" ]; then
+      echo "${package_name}: current: ${current} wanted: ${wanted} latest: ${latest} [${latest_diff_type} accepted]"
+      "${suppress_outdated}" --suppression "${cadence}" --"${latest_diff_type}" "${package_name}"
+    else
+      echo "${package_name}: current: ${current} wanted: ${wanted} latest: ${latest} [${outdated_diff_type} outdated]"
+      new=1
+    fi
+  elif [ -n "${accept}${refresh}" ]; then
+    echo "${package_name}: current: ${current} wanted: ${wanted} latest: ${latest} [${suppression_type} suppression refreshed]"
+    "${suppress_outdated}" --suppression "${cadence}" --"${suppression_type}" "${package_name}"
+  elif [ "$(date '+%s')" -gt "${suppression}" ]; then
     echo "${package_name}: current: ${current} wanted: ${wanted} latest: ${latest} [${outdated_diff_type} suppression expired]"
     new=1
   else
     echo "${package_name}: current: ${current} wanted: ${wanted} latest: ${latest} [${outdated_diff_type} suppressed]"
   fi
 done
-if [ -n "${new}" ]; then
+
+# If we're not within cadence and there are new outdated dependencies
+# then fail
+if [ -z "${within_cadence}" -a -n "${new}" ]; then
   exit 1
 fi
+
+# If there a no outdated dependencies and we're tracking last success then
+# refresh the last success timestamp.
+if [ -z "${new}" -a -n "${last}" ]; then
+  mkdir -p "${last}"
+  date +%s > "${last}/last_success"
+fi
 )

package/bin/suppress-outdated.sh

@@ -3,6 +3,24 @@
 # Insert a package name to suppress in outdated checks.
 #
 
+set -e
+
+usage() {
+  echo "Usage: suppress-outdated.sh [--suppression <number-of-days>] {--major|--minor|--patch} <package name> ..."
+}
+
+suppression=30
+if [ "$1" = "--suppression" ]; then
+  if [ -z "$2" ]; then
+    echo "ERROR: --suppression argument must specify a number of days argument" 1>&2
+    usage 1>&2
+    exit 1
+  fi
+  shift
+  suppression="$1"
+  shift
+fi
+
 case "$1" in
   --major)
     root=".outdatedSuppressions.major"
@@ -15,19 +33,28 @@ case "$1" in
     ;;
   *)
     echo "suppress-outdated.sh: Unrecognized option: '$1'" 1>&2
-    echo "Usage: suppress-outdated.sh {--major|--minor|--patch} <package name>" 1>&2
+    usage 1>&2
     exit 1
     ;;
 esac
+shift
 
-package_name="$2"
-PACKAGE_JSON="package.json"
-
-if [ -z "$package_name" ]; then
-  echo "Usage: yarn suppress-outdated {--major|--minor|--patch} <package name>"
+if [ -z "$1" ]; then
+  echo "suppress-outdated.sh: No package names specified" 1>&2
+  usage 1>&2
   exit 1
 fi
 
-cp $PACKAGE_JSON $PACKAGE_JSON.old
-cat $PACKAGE_JSON | jq "${root}.\"${package_name}\" = (now | floor | . + 1209600)" > $PACKAGE_JSON.staging
-mv $PACKAGE_JSON.staging $PACKAGE_JSON
+suppression_seconds=$((suppression * 24 * 3600))
+
+PACKAGE_JSON="package.json"
+cp "$PACKAGE_JSON" "$PACKAGE_JSON.old"
+
+while [ -n "$1" ]; do
+  package_name="$1"
+
+  jq < "$PACKAGE_JSON" "${root}.\"${package_name}\" = (now | floor | . + ${suppression_seconds})" > "$PACKAGE_JSON.staging"
+  mv "$PACKAGE_JSON.staging" "$PACKAGE_JSON"
+
+  shift
+done