Merge pull request #56 from atlassian/noissue/extracting-constants-for-URI-building

Author: diegoocampoh

README.md

@@ -5,7 +5,9 @@ Java/Kotlin lightweight implementation of RFC-6238 and RFC-4226 to generate and
 
 ## Maven / gradle dependency
 
-Check the latest package at [https://github.com/atlassian/1time/packages/](https://github.com/atlassian/1time/packages/)
+Check the latest package at [https://github.com/atlassian/1time/packages/](https://github.com/atlassian/1time/packages/). 
+
+Also check Maven central on: https://mvnrepository.com/artifact/com.atlassian/onetime
 
 ## Quick start
 

src/main/kotlin/com/atlassian/onetime/service/TOTPService.kt

@@ -8,7 +8,6 @@ import com.atlassian.onetime.model.TOTPSecret
 import java.net.URI
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
-import java.time.Clock
 
 interface TOTPService {
 
@@ -42,21 +41,32 @@ class DefaultTOTPService(
   private val totpConfiguration: TOTPConfiguration = TOTPConfiguration()
 ) : TOTPService {
 
+  companion object {
+    private const val SCHEME = "otpauth"
+    private const val TYPE = "totp"
+    private const val SECRET_QUERY_PARAM = "secret"
+    private const val ISSUER_QUERY_PARAM = "issuer"
+    private const val ALGORITHM_QUERY_PARAM = "algorithm"
+    private const val DIGITS_QUERY_PARAM = "digits"
+    private const val PERIOD_QUERY_PARAM = "period"
+
+  }
   override suspend  fun generateTotpSecret(): TOTPSecret = totpConfiguration.secretProvider.generateSecret()
 
   override suspend   fun generateTOTPUrl(
     totpSecret: TOTPSecret,
     emailAddress: EmailAddress,
     issuer: Issuer
   ): URI {
+
     val encodedEmailAddress: String = URLEncoder.encode(emailAddress.value, StandardCharsets.UTF_8)
     val encodedIssuer: String = URLEncoder.encode(issuer.value, StandardCharsets.UTF_8)
-    val template = "otpauth://totp/$encodedIssuer:$encodedEmailAddress?" +
-      "secret=${totpSecret.base32Encoded}" +
-      "&issuer=$encodedIssuer" +
-      "&algorithm=${totpGenerator.digest.toQueryParam()}" +
-      "&digits=${totpGenerator.otpLength.value}" +
-      "&period=${totpGenerator.timeStepSeconds}"
+    val template = "$SCHEME://$TYPE/$encodedIssuer:$encodedEmailAddress?" +
+      "$SECRET_QUERY_PARAM=${totpSecret.base32Encoded}" +
+      "&$ISSUER_QUERY_PARAM=$encodedIssuer" +
+      "&$ALGORITHM_QUERY_PARAM=${totpGenerator.digest.toQueryParam()}" +
+      "&$DIGITS_QUERY_PARAM=${totpGenerator.otpLength.value}" +
+      "&$PERIOD_QUERY_PARAM=${totpGenerator.timeStepSeconds}"
     return URI(template)
   }