Update 2025-05-21_08:58:06

register.py

@@ -15,14 +15,51 @@ MAGIC_DOMAIN = "https://dicta2stream.net"
 
 @router.post("/register")
 def register(request: Request, email: str = Form(...), user: str = Form(...), db: Session = Depends(get_db)):
-    if db.get(User, email):
-        raise HTTPException(status_code=400, detail="Email already registered")
-
+    from sqlalchemy.exc import IntegrityError
+    # Try to find user by email or username
+    existing_user = db.get(User, email)
+    if not existing_user:
+        # Try by username (since username is not primary key, need to query)
+        stmt = select(User).where(User.username == user)
+        existing_user = db.exec(stmt).first()
     token = str(uuid.uuid4())
-    db.add(User(email=email, username=user, token=token, confirmed=False, ip=request.client.host))
-    db.add(UserQuota(uid=user))
-    db.commit()
-
+    if existing_user:
+        # Update token, timestamp, and ip, set confirmed False
+        from datetime import datetime
+        existing_user.token = token
+        existing_user.token_created = datetime.utcnow()
+        existing_user.confirmed = False
+        existing_user.ip = request.client.host
+        db.add(existing_user)
+        try:
+            db.commit()
+        except Exception as e:
+            db.rollback()
+            raise HTTPException(status_code=500, detail=f"Database error: {e}")
+    else:
+        # Register new user
+        db.add(User(email=email, username=user, token=token, confirmed=False, ip=request.client.host))
+        db.add(UserQuota(uid=user))
+        try:
+            db.commit()
+        except Exception as e:
+            db.rollback()
+            if isinstance(e, IntegrityError):
+                # Race condition: user created after our check
+                # Try again as login
+                stmt = select(User).where((User.email == email) | (User.username == user))
+                existing_user = db.exec(stmt).first()
+                if existing_user:
+                    existing_user.token = token
+                    existing_user.confirmed = False
+                    existing_user.ip = request.client.host
+                    db.add(existing_user)
+                    db.commit()
+                else:
+                    raise HTTPException(status_code=409, detail="Username or email already exists.")
+            else:
+                raise HTTPException(status_code=500, detail=f"Database error: {e}")
+    # Send magic link
     msg = EmailMessage()
     msg["From"] = MAGIC_FROM
     msg["To"] = email
@@ -30,11 +67,9 @@ def register(request: Request, email: str = Form(...), user: str = Form(...), db
     msg.set_content(
         f"Hello {user},\n\nClick to confirm your account:\n{MAGIC_DOMAIN}/?token={token}\n\nThis link is valid for one-time login."
     )
-
     try:
         with smtplib.SMTP("localhost") as smtp:
             smtp.send_message(msg)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Email failed: {e}")
-
     return { "message": "Confirmation sent" }