🐛 Switch back to bcryptjs to fix issues with FreeBSD and ARM #1696

n8n-io · May 22, 2021 · f43781b · f43781b
1 parent 343e63e
commit f43781b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -55,6 +55,7 @@
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.2",
     "@types/basic-auth": "^1.1.2",
+    "@types/bcryptjs": "^2.4.2",
     "@types/bull": "^3.3.10",
     "@types/compression": "1.0.1",
     "@types/connect-history-api-fallback": "^1.3.1",
@@ -79,11 +80,11 @@
     "typescript": "~3.9.7"
   },
   "dependencies": {
-    "@node-rs/bcrypt": "^1.2.0",
     "@oclif/command": "^1.5.18",
     "@oclif/errors": "^1.2.2",
     "@types/jsonwebtoken": "^8.3.4",
     "basic-auth": "^2.0.1",
+    "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "body-parser-xml": "^1.1.0",
     "bull": "^3.19.0",

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
@@ -22,7 +22,9 @@ import { RequestOptions } from 'oauth-1.0a';
 import * as csrf from 'csrf';
 import * as requestPromise from 'request-promise-native';
 import { createHmac } from 'crypto';
-import { compare } from '@node-rs/bcrypt';
+// IMPORRTANT! Do not switch to anther bcrypt library unless really needed and
+// tested with all possible systems like Windows, Alpine on ARM, FreeBSD, ...
+import { compare } from 'bcryptjs';
 import * as promClient from 'prom-client';
 
 import {