Use 2FA description if name is not available #190

Levminer · Mar 5, 2022 · 8590e44 · 8590e44
1 parent 7474363
commit 8590e44
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/app/import/src/js/index.js b/app/import/src/js/index.js
@@ -179,7 +179,12 @@ const qrConvert = (data) => {
 	url = url.slice(secret.length + 14 + 1)
 
 	// get issuer
-	const issuer = url
+	let issuer = url
+
+	// check if issuer is empty
+	if (issuer === "") {
+		issuer = name
+	}
 
 	// add to final string
 	return `\nName:   ${name} \nSecret: ${secret} \nIssuer: ${issuer} \nType:   OTP_TOTP\n`

diff --git a/lib/convert.js b/lib/convert.js
@@ -46,7 +46,7 @@ module.exports = {
 				const names_after = names_before.slice(8)
 
 				if (names_after.length > 40) {
-					names.push(`${names_after.trim().slice(0, 40)}...`)
+					names.push(`${names_after.trim().slice(0, 38)}...`)
 				} else {
 					names.push(names_after.trim())
 				}
@@ -67,8 +67,8 @@ module.exports = {
 				const issuers_before = data[i]
 				const issuers_after = issuers_before.slice(8)
 
-				if (issuers_after.length > 15) {
-					issuers.push(`${issuers_after.trim().slice(0, 15)}...`)
+				if (issuers_after.length > 16) {
+					issuers.push(`${issuers_after.trim().slice(0, 14)}...`)
 				} else {
 					issuers.push(issuers_after.trim())
 				}

diff --git a/lib/qrcodeConverter.js b/lib/qrcodeConverter.js
@@ -58,6 +58,10 @@ module.exports = {
 				issuer: final.otp_parameters[i].issuer,
 			}
 
+			if (obj.issuer === "") {
+				obj.issuer = obj.name
+			}
+
 			arr.push(obj)
 		}