diff --git a/lamassu-schema.json b/lamassu-schema.json index 7e114cb8..f93f9377 100644 --- a/lamassu-schema.json +++ b/lamassu-schema.json @@ -57,6 +57,26 @@ } ] }, + { + "code": "extraServices", + "display": "Extra services", + "cryptoScope": "global", + "machineScope": "global", + "entries": [ + { + "code": "sms", + "display": "SMS gateway", + "fieldType": "account", + "fieldClass": "sms" + }, + { + "code": "email", + "display": "Email gateway", + "fieldType": "account", + "fieldClass": "email" + } + ] + }, { "code": "currencies", "display": "Currencies", @@ -121,12 +141,24 @@ "cryptoScope": "global", "machineScope": "both", "entries": [ + { + "code": "smsVerificationEnabled", + "display": "SMS verification", + "fieldType": "onOff", + "fieldClass": null + }, { "code": "idVerificationEnabled", "display": "ID verification", "fieldType": "onOff", "fieldClass": null }, + { + "code": "idVerifier", + "display": "ID verify service", + "fieldType": "account", + "fieldClass": "idVerifier" + }, { "code": "idVerificationLimit", "display": "ID Verification Limit", @@ -193,18 +225,6 @@ "fieldType": "onOff", "fieldClass": null }, - { - "code": "email", - "display": "Email", - "fieldType": "account", - "fieldClass": "email" - }, - { - "code": "sms", - "display": "SMS", - "fieldType": "account", - "fieldClass": "sms" - }, { "code": "lowBalanceThreshold", "display": "Low Balance Threshold", diff --git a/lib/plugins.js b/lib/plugins.js index 5e074211..3500859d 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -133,7 +133,9 @@ function loadPlugin (name, config) { function loadOrConfigPlugin (pluginHandle, pluginType, cryptoCode, config, accounts, options, onChangeCallback) { - const currentName = config.cryptoServices[pluginType] + const currentName = config.cryptoServices[pluginType] || + config.extraServices[pluginType] || + config.compliance[pluginType] currentlyUsedPlugins[cryptoCode] = currentlyUsedPlugins[cryptoCode] || {} diff --git a/lib/routes.js b/lib/routes.js index 79525f09..a2ecb462 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -96,6 +96,7 @@ function poll (req, res) { locale, txLimit: config.limits.cashInTransactionLimit, idVerificationEnabled: config.compliance.idVerificationEnabled, + smsVerificationEnabled: config.compliance.smsVerificationEnabled, cartridges, twoWayMode: !!cartridges, zeroConfLimit: config.commissions.zeroConfLimit, diff --git a/package.json b/package.json index eee1e49a..74e840e7 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,9 @@ "lamassu-config": "lamassu/lamassu-config#alpha", "lamassu-identitymind": "^1.2.9", "lamassu-kraken": "^1.0.3", - "lamassu-mock-wallet": "^1.0.0", + "lamassu-mock-id-verify": "^1.0.1", + "lamassu-mock-sms": "^1.0.1", + "lamassu-mock-wallet": "^1.0.3", "lamassu-smtp2go": "^1.0.3", "lamassu-twilio": "^1.1.1", "migrate": "^0.2.2", diff --git a/yarn.lock b/yarn.lock index 66cbec07..3c66a0bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -850,9 +850,17 @@ lamassu-kraken@^1.0.3: lodash "^4.8.1" promptly "^1.1.0" +lamassu-mock-id-verify: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lamassu-mock-id-verify/-/lamassu-mock-id-verify-1.0.1.tgz#f73a7aef12023b914868d65f602ba7b9d1dc8257" + +lamassu-mock-sms: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lamassu-mock-sms/-/lamassu-mock-sms-1.0.1.tgz#a52b17cf646b5a132b69e94aeb50cc30cb43bc50" + lamassu-mock-wallet: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lamassu-mock-wallet/-/lamassu-mock-wallet-1.0.0.tgz#6d3ab723332e814fd50463c4917db1ce398845a8" + version "1.0.3" + resolved "https://registry.yarnpkg.com/lamassu-mock-wallet/-/lamassu-mock-wallet-1.0.3.tgz#1aa9bdf228e38c6916e2ba682bc07c05924533fe" lamassu-smtp2go@^1.0.3: version "1.0.3"