Cherry-pick from PR #2435 (Show TOTP Issuer)

2 files changed, 6 insertions, 2 deletions

diff --git a/app/Auth/TotpAuth.php b/app/Auth/TotpAuth.php
index f4304930..8e1ebe35 100644
--- a/app/Auth/TotpAuth.php
+++ b/app/Auth/TotpAuth.php
@@ -123,7 +123,8 @@ class TotpAuth extends Base implements PostAuthenticationProviderInterface
             return '';
         }
 
-        return GoogleAuthenticator::getQrCodeUrl('totp', $label, $this->secret);
+        $options = array('issuer' => TOTP_ISSUER);
+        return GoogleAuthenticator::getQrCodeUrl('totp', $label, $this->secret, null, $options);
     }
 
     /**
@@ -139,6 +140,7 @@ class TotpAuth extends Base implements PostAuthenticationProviderInterface
             return '';
         }
 
-        return GoogleAuthenticator::getKeyUri('totp', $label, $this->secret);
+        $options = array('issuer' => TOTP_ISSUER);
+        return GoogleAuthenticator::getKeyUri('totp', $label, $this->secret, null, $options);
     }
 }
diff --git a/app/constants.php b/app/constants.php
index fc120692..40b88fe9 100644
--- a/app/constants.php
+++ b/app/constants.php
@@ -134,3 +134,5 @@ defined('HTTP_PROXY_PORT') or define('HTTP_PROXY_PORT', '3128');
 defined('HTTP_PROXY_USERNAME') or define('HTTP_PROXY_USERNAME', '');
 defined('HTTP_PROXY_PASSWORD') or define('HTTP_PROXY_PASSWORD', '');
 defined('HTTP_VERIFY_SSL_CERTIFICATE') or define('HTTP_VERIFY_SSL_CERTIFICATE', true);
+
+defined('TOTP_ISSUER') or define('TOTP_ISSUER', 'Kanboard');