Apply suggestions from code review

Don't add a new struct in the interface just for local usage, use unnamed struct instead Co-authored-by: alexzorin <alex@zorin.au>
alexzorin · Jan 16, 2023 · c2ad78d · c2ad78d
1 parent fe5d4fa
commit c2ad78d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/cmd/authy-export/authy-export.go b/cmd/authy-export/authy-export.go
@@ -28,11 +28,14 @@ type deviceRegistration struct {
 }
 
 func main() {
-	savePtr := flag.String("save", "", "Save encrypted tokens and apps to this json file")
-	loadPtr := flag.String("load", "", "Load tokens from this json file instead of the server")
+	savePtr := flag.String("save", "", "Save encrypted tokens and apps to this JSON file")
+	loadPtr := flag.String("load", "", "Load tokens from this JSON file instead of the server")
 	flag.Parse()
 
-	var resp authy.AuthenticatorResponse
+	var resp struct {
+		Tokens authy.AuthenticatorTokensResponse `json:"tokens"`
+		Apps   authy.AuthenticatorAppsResponse   `json:"apps"`
+	}
 	if *loadPtr != "" {
 		// Get tokens from the json file
 		f, err := os.Open(*loadPtr)

diff --git a/objects.go b/objects.go
@@ -245,10 +245,3 @@ func (a AuthenticatorApp) Token() (string, error) {
 	encoder := base32.StdEncoding.WithPadding(base32.NoPadding)
 	return encoder.EncodeToString(decoded), nil
 }
-
-type AuthenticatorResponse struct {
-	Tokens AuthenticatorTokensResponse `json:"tokens"`
-
-	Apps AuthenticatorAppsResponse `json:"apps"`
-}
-