fix for #53

Per Google's otpauth:// URI spec (https://github.com/google/google-authenticator/wiki/Key-Uri-Format#issuer),
the issuer in the URI path and the issuer parameter are equivalent.

Per #53, Authy does not correctly parse the latter.
Therefore, we include only the former (issuer in the URI path) for maximum compatibility.

Author: dlenski

tests/test_utils.py

@@ -89,7 +89,7 @@ def test_generate_totp_uri():
         'timeskew': 0,
     }
     test_secret = b'ZqeD\xd9wg]"\x12\x1f7\xc7v6"\xf0\x13\\i'
-    expected_uri = urlparse.urlparse('otpauth://totp/VIP%20Access:SYMC26070843?secret=LJYWKRGZO5TV2IQSD434O5RWELYBGXDJ&issuer=VIP%20Access&digits=6&algorithm=SHA1&period=30&image=https://raw.githubusercontent.com/dlenski/python-vipaccess/master/vipaccess.png')
+    expected_uri = urlparse.urlparse('otpauth://totp/VIP%20Access:SYMC26070843?secret=LJYWKRGZO5TV2IQSD434O5RWELYBGXDJ&digits=6&algorithm=SHA1&period=30&image=https://raw.githubusercontent.com/dlenski/python-vipaccess/master/vipaccess.png')
     generated_uri = urlparse.urlparse(generate_otp_uri(test_token, test_secret))
     assert_equal(expected_uri.scheme, generated_uri.scheme)
     assert_equal(expected_uri.netloc, generated_uri.netloc)
@@ -113,7 +113,7 @@ def test_generate_hotp_uri():
         'timeskew': 0,
     }
     test_secret = b'\x9a\x13\xcd2!\xad\xbd\x97R\xfcEE\xb6\x92e\xb4\x14\xb0\xfem'
-    expected_uri = urlparse.urlparse('otpauth://hotp/VIP%20Access:UBHE57586348?digits=6&algorithm=SHA1&counter=1&issuer=VIP%20Access&secret=TIJ42MRBVW6ZOUX4IVC3NETFWQKLB7TN&image=https://raw.githubusercontent.com/dlenski/python-vipaccess/master/vipaccess.png')
+    expected_uri = urlparse.urlparse('otpauth://hotp/VIP%20Access:UBHE57586348?digits=6&algorithm=SHA1&counter=1&secret=TIJ42MRBVW6ZOUX4IVC3NETFWQKLB7TN&image=https://raw.githubusercontent.com/dlenski/python-vipaccess/master/vipaccess.png')
     generated_uri = urlparse.urlparse(generate_otp_uri(test_token, test_secret))
     assert_equal(expected_uri.scheme, generated_uri.scheme)
     assert_equal(expected_uri.netloc, generated_uri.netloc)

vipaccess/provision.py

@@ -185,8 +185,12 @@ def generate_otp_uri(token, secret, issuer='VIP Access', image='https://raw.gith
         secret=secret,
         digits=token.get('digits', 6),
         algorithm=token.get('algorithm', 'SHA1').upper(),
-        issuer=issuer,
         image=image,
+        # Per Google's otpauth:// URI spec (https://github.com/google/google-authenticator/wiki/Key-Uri-Format#issuer),
+        # the issuer in the URI path and the issuer parameter are equivalent.
+        # Per #53, Authy does not correctly parse the latter.
+        # Therefore, we include only the former (issuer in the URI path) for maximum compatibility.
+        # issuer=issuer,
     )
     if token.get('counter') is not None: # HOTP
         data['counter'] = token['counter']