Merge pull request #46 from VPKSoft/fix_url_generation

Fix otpauth-URI generation makeOtpAuthKey function.
VPKSoft · Dec 28, 2023 · e67ec20 · e67ec20
2 parents 99bcfad + fc5e287
commit e67ec20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gauth-decode",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "A package to decode Google Authenticator export data",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",

diff --git a/src/auth_exporter.ts b/src/auth_exporter.ts
@@ -124,7 +124,15 @@ const decode = async (data: string) => {
  */
 const makeOtpAuthKey = (otpData: OtpDataWithBase32, useBase32Secret: boolean = true) => {
     // TODO::Proper URI builder for OTP!
-    return `otpauth://totp/${otpData.name}?secret=${useBase32Secret ? otpData.secretBase32 : otpData.secret}&issuer=${otpData.issuer}`;
+
+    // The name part should contain the issuer also, to fix this lets just change the issuer if they differ.
+    let issuerFromName = otpData.issuer;
+    const nameData = otpData.name.split(":");
+    if (nameData.length === 2 && nameData[0] !== otpData.issuer) {
+        issuerFromName = nameData[0];
+    }
+
+    return `otpauth://totp/${otpData.name}?secret=${useBase32Secret ? otpData.secretBase32 : otpData.secret}&issuer=${issuerFromName}`;
 };
 
 export type { OtpDataWithBase32 };