Merge branch 'master'

Conflicts:
	test/generate.js

README.md

@@ -626,6 +626,7 @@ Authenticator URL to obtain a QR code you can scan into the app.
 | [options.name] | <code>String</code> |  | The name to use with Google Authenticator. |
 | [options.qr_codes] | <code>Boolean</code> | <code>false</code> | (DEPRECATED. Do not use to prevent   leaking of secret to a third party. Use your own QR code implementation.)   Output QR code URLs for the token. |
 | [options.google_auth_qr] | <code>Boolean</code> | <code>false</code> | (DEPRECATED. Do not use to   prevent leaking of secret to a third party. Use your own QR code   implementation.) Output a Google Authenticator otpauth:// QR code URL. |
+| [options.issuer] | <code>String</code> |  | The provider or service with which the secret key is associated. |
 
 <a name="generateSecretASCII"></a>
 ### generateSecretASCII([length], [symbols]) ⇒ <code>String</code>

index.js

@@ -472,6 +472,8 @@ exports.totp.verify = function totpVerify (options) {
  * @param {Boolean} [options.google_auth_qr=false] (DEPRECATED. Do not use to
  *   prevent leaking of secret to a third party. Use your own QR code
  *   implementation.) Output a Google Authenticator otpauth:// QR code URL.
+ * @param {String} [options.issuer=''] The provider or service with which the
+ *   secret key is associated.
  * @return {Object}
  * @return {GeneratedSecret} The generated secret key.
  */
@@ -484,6 +486,7 @@ exports.generateSecret = function generateSecret (options) {
   var google_auth_qr = options.google_auth_qr || false;
   var otpauth_url = options.otpauth_url != null ? options.otpauth_url : true;
   var symbols = true;
+  var issuer = options.issuer;
 
   // turn off symbols only when explicity told to
   if (options.symbols !== undefined && options.symbols === false) {
@@ -511,7 +514,8 @@ exports.generateSecret = function generateSecret (options) {
   if (otpauth_url) {
     SecretKey.otpauth_url = exports.otpauthURL({
       secret: SecretKey.ascii,
-      label: name
+      label: name,
+      issuer: issuer
     });
   }
 

test/generate.js

@@ -135,7 +135,7 @@ describe('Generator tests', function () {
     var secret = new Buffer(answer.ascii, 'ascii');
     if (Buffer.isBuffer(secret)) secret = base32.encode(secret);
 
-    var expect = 'otpauth://totp/Example%3Aalice%40google.com?secret=' + secret + '&issuer=issuer%20name&algorithm=SHA1&digits=6&period=30';
+    var expect = 'otpauth://totp/Example%3Aalice%40google.com?secret=' + secret + '&issuer=issuer%20name';
     assert.deepEqual(
       answer.otpauth_url,
       expect