Merge branch '4.0'

.editorconfig

@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.yml,package.json,*.js,*.scss}]
+[{*.yml,package.json,*.js,*.json,*.scss}]
 indent_size = 2
 indent_style = space
 

.travis.yml

@@ -25,7 +25,7 @@ before_script:
 
   # Install composer
   - composer validate
-  - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
+  - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION" silverstripe/recipe-testing:^1
   - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
   - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 

.tx/config

@@ -0,0 +1,14 @@
+[main]
+host = https://www.transifex.com
+
+[silverstripe-totp-authenticator.master]
+file_filter = lang/<lang>.yml
+source_file = lang/en.yml
+source_lang = en
+type = YML
+
+[silverstripe-totp-authenticator.master-js]
+file_filter = client/lang/src/<lang>.json
+source_file = client/lang/src/en.json
+source_lang = en
+type = KEYVALUEJSON

README.md

@@ -5,7 +5,7 @@
 [![codecov](https://codecov.io/gh/silverstripe/silverstripe-totp-authenticator/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-totp-authenticator)
 [![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
-Log in to SilverStripe with an authenticator app on your phone as a second factor, using a time-based one-time
+Log in to SilverStripe with an authenticator app on your phone as a secondary factor, using a time-based one-time
 password (TOTP).
 
 This module provides a TOTP authenticator that plugs in to the [silverstripe/mfa](https://github.com/silverstripe/mfa)

client/lang/src/en.json

@@ -0,0 +1,12 @@
+{
+  "TOTPRegister.NEXT": "Next",
+  "TOTPRegister.BACK": "Back",
+  "TOTPRegister.INTRO": "Verification codes are created by an app on your phone. ",
+  "TOTPRegister.OR": "Or",
+  "TOTPRegister.MANUAL": "Enter manually the following code into authentication app:",
+  "TOTPRegister.HOW_TO_USE": "How to use authenticator app.",
+  "TOTPVerify.NEXT": "Next",
+  "TOTPVerify.HOW_TO_USE": "How to use authenticator app.",
+  "TOTPVerify.VERIFY": "Use verification code from your authenticator app. ",
+  "TOTPVerify.ENTER_CODE": "Enter {length}-digit code"
+}

client/src/components/TOTP/Register.js

@@ -127,7 +127,7 @@ class Register extends Component {
         <div className="mfa-totp__scan">
           <p>{ i18n._t(
             'TOTPRegister.INTRO',
-            'Use an authentication app such as Google Authenticator to scan the following code. '
+            'Verification codes are created by an app on your phone. '
           ) }{ this.renderSupportLink() }</p>
 
           <div className="mfa-totp__scan-code">

composer.json

@@ -14,7 +14,7 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": ">=7.1.0",
-        "silverstripe/mfa": "^4.0",
+        "silverstripe/mfa": "^4.0@dev",
         "silverstripe/siteconfig": "^4.0",
         "spomky-labs/otphp": "^9.1",
         "paragonie/constant_time_encoding": "^2.0"

lang/en.yml

@@ -0,0 +1,10 @@
+en:
+  SilverStripe\TOTP\Method:
+    NOT_CONFIGURED: 'This method has not been configured yet.'
+  SilverStripe\TOTP\RegisterHandler:
+    DESCRIPTION: 'Use an authentication app such as Google Authenticator to scan the following code'
+    INVALID_CODE: 'Provided code was not valid'
+    NAME: 'Authenticator app'
+  SilverStripe\TOTP\VerifyHandler:
+    INVALID_CODE: 'Invalid code'
+    NAME: 'Verify with authenticator app'