Junie: cleanups. Code fixups.

cmd/mcias/totp.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"database/sql"
+	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -13,7 +14,6 @@ import (
 )
 
 const (
-	// userQuery is the SQL query to get user information from the database
 	userQuery = `SELECT id, created, user, password, salt, totp_secret FROM users WHERE user = ?`
 )
 
@@ -60,7 +60,6 @@ This command requires a username. It will emit the secret, and optionally output
 	},
 }
 
-// setupTOTPCommands initializes TOTP commands and flags
 func setupTOTPCommands() {
 	rootCmd.AddCommand(totpCmd)
 	totpCmd.AddCommand(enableTOTPCmd)
@@ -100,7 +99,6 @@ func enableTOTP() {
 	}
 	defer db.Close()
 
-	// Get the user from the database
 	var userID string
 	var created int64
 	var username string
@@ -109,7 +107,7 @@ func enableTOTP() {
 
 	err = db.QueryRow(userQuery, totpUsername).Scan(&userID, &created, &username, &password, &salt, &totpSecret)
 	if err != nil {
-		if err == sql.ErrNoRows {
+		if errors.Is(err, sql.ErrNoRows) {
 			logger.Fatalf("User %s does not exist", totpUsername)
 		}
 		logger.Fatalf("Failed to get user: %v", err)
@@ -168,7 +166,7 @@ func validateTOTP() {
 
 	err = db.QueryRow(userQuery, totpUsername).Scan(&userID, &created, &username, &password, &salt, &totpSecret)
 	if err != nil {
-		if err == sql.ErrNoRows {
+		if errors.Is(err, sql.ErrNoRows) {
 			logger.Fatalf("User %s does not exist", totpUsername)
 		}
 		logger.Fatalf("Failed to get user: %v", err)
@@ -226,7 +224,7 @@ func addTOTP() {
 
 	err = db.QueryRow(userQuery, totpUsername).Scan(&userID, &created, &username, &password, &salt, &totpSecret)
 	if err != nil {
-		if err == sql.ErrNoRows {
+		if errors.Is(err, sql.ErrNoRows) {
 			logger.Fatalf("User %s does not exist", totpUsername)
 		}
 		logger.Fatalf("Failed to get user: %v", err)