2025.6.2

server/mergin/auth/commands.py

@@ -2,12 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+import sys
 import click
 from flask import Flask
 from sqlalchemy import or_, func
 
 from ..app import db
 from .models import User, UserProfile
+from ..commands import normalize_input
 
 
 def add_commands(app: Flask):
@@ -17,24 +19,25 @@ def user():
         pass
 
     @user.command()
-    @click.argument("username")
+    @click.argument("username", callback=normalize_input())
     @click.argument("password")
     @click.option("--is-admin", is_flag=True)
-    @click.option("--email", required=True)
+    @click.option("--email", required=True, callback=normalize_input())
     def create(username, password, is_admin, email):  # pylint: disable=W0612
         """Create user account"""
         user = User.query.filter(
             or_(
-                func.lower(User.username) == func.lower(username),
-                func.lower(User.email) == func.lower(email),
+                func.lower(User.username) == username,
+                func.lower(User.email) == email,
             )
-        ).first()
+        ).count()
         if user:
-            print("ERROR: User already exists!\n")
-            return
+            click.secho("ERROR: User already exists", fg="red", err=True)
+            sys.exit(1)
 
         user = User(username=username, passwd=password, is_admin=is_admin, email=email)
         user.profile = UserProfile()
         user.active = True
         db.session.add(user)
         db.session.commit()
+        click.secho("User created", fg="green")