diff --git a/.git-hooks/pre-push b/.git-hooks/pre-commit similarity index 66% rename from .git-hooks/pre-push rename to .git-hooks/pre-commit index 6e79d5f..0232fdd 100755 --- a/.git-hooks/pre-push +++ b/.git-hooks/pre-commit @@ -6,6 +6,7 @@ if npm run --silent lint:silent ; then exit 0 else - echo "❌ Prettier check failed! Please run lint:fix." + npm run --silent lint:fix + echo "❌ Prettier check failed! We ran lint:fix for you. Please add & commit again." exit 1 fi diff --git a/package.json b/package.json index a88e5e1..0edb94d 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "build": "rimraf build && rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && rimraf build/src && rimraf node", "package:lib": "npm run build && copyfiles ./package.json ./checkNodeVersion.js build && cd build && npm version \"5.0.0\" && npm pack", "publish:lib": "npm run build && cd build && npm publish", - "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", + "lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", - "lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", + "lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", "test": "jest --silent --coverage", "prepublishOnly": "cp -r ./build/* . && rm -rf ./build", "postpublish": "git clean -fd", diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts index e442291..5d69c94 100644 --- a/src/auth/AuthManager.ts +++ b/src/auth/AuthManager.ts @@ -171,7 +171,7 @@ export class AuthManager { if (isLoggedIn) { if (this.serverType === ServerType.Sas9) { - await this.performCASSecurityCheck(); + await this.performCASSecurityCheck() } this.loginCallback()