including a nonce into app id to allow to a user to create multiple apps with the same email

Author: lucasmenendez

api/apps.go

@@ -145,10 +145,13 @@ func generateApp(email string) (string, string, string, error) {
 		return "", "", "", fmt.Errorf("email is required")
 	}
 	// hash email
-	appId, err := helpers.Hash(email, helpers.AppIdSize)
+	hEmail, err := helpers.Hash(email, helpers.EmailHashSize)
 	if err != nil {
 		return "", "", "", err
 	}
+	bAppNonce := helpers.RandBytes(helpers.AppNonceSize)
+	hAppNonce := hex.EncodeToString(bAppNonce)
+	appId := hEmail + hAppNonce
 	// generate secret
 	secret, hSecret, err := appSecret()
 	if err != nil {

api/tokens.go

@@ -131,8 +131,9 @@ func (s *Service) validAdminToken(token, rawSecret string) (string, bool) {
 	if err != nil {
 		return "", false
 	}
-	// the admin has the same id as the app (the hased email)
-	if userId != appId {
+	// the app id is composed by the admin user id hash and a nonce, so
+	// the app id starts with the admin user id, check if so
+	if !strings.HasPrefix(appId, userId) {
 		return "", false
 	}
 	// check if the secret is valid

cmd/authapi/main.go

@@ -17,7 +17,7 @@ import (
 const (
 	defaultHost               = "0.0.0.0"
 	defaultPort               = 8080
-	defaultDatabaseURI        = "mongodb://localhost:27017"
+	defaultDatabaseURI        = "mongodb://admin:password@localhost:27017/"
 	defaultDatabaseName       = "simpleauth"
 	defaultEmailAddr          = ""
 	defaultEmailPass          = ""
@@ -89,7 +89,7 @@ func main() {
 		MongoURI: c.dbURI,
 		Database: c.dbName,
 	}); err != nil {
-		log.Fatalln("error initializing db: %w", err)
+		log.Fatalf("error initializing db: %v", err)
 	}
 	// create the service
 	service, err := api.New(context.Background(), db, &api.Config{

helpers/consts.go

@@ -32,8 +32,15 @@ const (
 	// value of 4 (bytes).
 	UserIdSize = 4
 	// AppIdSize constant is the size of the app id, which is an integer with a
-	// value of 4 (bytes).
-	AppIdSize = 4
+	// value of 8 (bytes).
+	AppIdSize = 8
+	// EmailHashSize constant is the size of the email hash, which is an integer
+	// with a value of 4 (bytes). The email hash is used to generate the user id
+	// and the app id.
+	EmailHashSize = 4
+	// AppNonceSize constant is the size of the app nonce, which is an integer
+	// with a value of 4 (bytes). The app nonce is used to generate the app id.
+	AppNonceSize = 4
 	// SecretSize constant is the size of the secret, which is an integer with a
 	// value of 16 (bytes).
 	SecretSize = 16