From 3229de75f800d9c6cc645f412ba3427510ee5a9c Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 26 Jun 2019 13:58:50 +0100
Subject: [PATCH] Revert "Replaced keypair with rsa-keypair module (#10758)"

This reverts commit 64735693beda5800bc81fdcd610d71a84ca36896.

- `rsa-keypair` is a binary dependency that was failing to install for a lot of users, reverting for now so we can look at alternative options for speeding up boot time
---
 core/server/models/settings.js | 10 ++++++----
 package.json                   |  2 +-
 yarn.lock                      |  9 ++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/server/models/settings.js b/core/server/models/settings.js
index 2f7371dde2..da69f853f8 100644
--- a/core/server/models/settings.js
+++ b/core/server/models/settings.js
@@ -2,7 +2,7 @@ const Promise = require('bluebird'),
     _ = require('lodash'),
     uuid = require('uuid'),
     crypto = require('crypto'),
-    keypair = require('rsa-keypair'),
+    keypair = require('keypair'),
     ghostBookshelf = require('./base'),
     common = require('../lib/common'),
     validation = require('../data/validation'),
@@ -25,10 +25,12 @@ function parseDefaultSettings() {
             theme_session_secret: crypto.randomBytes(32).toString('hex')
         };
 
-    const membersKeypair = keypair.generate(1024);
+    const membersKeypair = keypair({
+        bits: 1024
+    });
 
-    dynamicDefault.members_public_key = membersKeypair.publicKey;
-    dynamicDefault.members_private_key = membersKeypair.privateKey;
+    dynamicDefault.members_public_key = membersKeypair.public;
+    dynamicDefault.members_private_key = membersKeypair.private;
 
     _.each(defaultSettingsInCategories, function each(settings, categoryName) {
         _.each(settings, function each(setting, settingName) {
diff --git a/package.json b/package.json
index 803dc467ec..b3dd47a4dd 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
     "js-yaml": "3.13.1",
     "jsonpath": "1.0.0",
     "jsonwebtoken": "8.4.0",
+    "keypair": "1.0.1",
     "knex": "0.14.6",
     "knex-migrator": "3.2.5",
     "lodash": "4.17.11",
@@ -112,7 +113,6 @@
     "passport-oauth2-client-password": "0.1.2",
     "path-match": "1.2.4",
     "probe-image-size": "4.0.0",
-    "rsa-keypair": "^2.0.2",
     "rss": "1.2.2",
     "sanitize-html": "1.20.0",
     "semver": "5.6.0",
diff --git a/yarn.lock b/yarn.lock
index e63c0a00b2..8d7b715454 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3949,6 +3949,10 @@ keygrip@~1.0.2, keygrip@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc"
 
+keypair@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/keypair/-/keypair-1.0.1.tgz#7603719270afb6564ed38a22087a06fc9aa4ea1b"
+
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -6262,11 +6266,6 @@ rimraf@~2.4.0:
   dependencies:
     glob "^6.0.1"
 
-rsa-keypair@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/rsa-keypair/-/rsa-keypair-2.0.2.tgz#47ec7fa29486ceaefdd1af1f80f1db2284dba236"
-  integrity sha512-FmMjEQrH9oJrBy13wMbSQx1bomRbub7mzxwvVuXFvqJIeZ7NkWd9NJhFoeftd4lzQAeLP8/avm7HHmtEIGLHpQ==
-
 rss@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/rss/-/rss-1.2.2.tgz#50a1698876138133a74f9a05d2bdc8db8d27a921"