add_user data into req body

api/kiwi_vpn_api/config.py

@@ -32,14 +32,37 @@ class DBType(Enum):
 
 
 class DBConfig(BaseModel):
-    db_type: DBType = DBType.sqlite
+    type: DBType = DBType.sqlite
+    user: str | None = None
+    password: str | None = None
+    host: str | None = None
+    database: str | None = "./tmp/vpn.db"
+
+    mysql_driver: str = "pymysql"
+    mysql_args: list[str] = ["charset=utf8mb4"]
 
     @property
     async def db_engine(self) -> Engine:
-        return create_engine(
+        if self.type is DBType.sqlite:
-            "sqlite:///./tmp/vpn.db",
+            # SQLite backend
-            connect_args={"check_same_thread": False},
+            return create_engine(
-        )
+                f"sqlite:///{self.database}",
+                connect_args={"check_same_thread": False},
+            )
+
+        elif self.type is DBType.mysql:
+            # MySQL backend
+            if self.mysql_args:
+                args_str = "?" + "&".join(self.mysql_args)
+            else:
+                args_str = ""
+
+            return create_engine(
+                f"mysql+{self.mysql_driver}://"
+                f"{self.user}:{self.password}@{self.host}"
+                f"/{self.database}{args_str}",
+                pool_recycle=3600,
+            )
 
 
 class JWTConfig(BaseModel):

api/kiwi_vpn_api/routers/admin.py

@@ -48,20 +48,17 @@ async def set_config(
     },
 )
 async def add_user(
-    user_name: str,
+    user: schemas.UserCreate,
-    user_password: str,
     current_config: Config | None = Depends(Config.load),
     db: Session | None = Depends(Connection.get),
 ):
     if current_config is None:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST)
 
+    user.capabilities.append("admin")
+
     schemas.User.create(
         db=db,
-        user=schemas.UserCreate(
+        user=user,
-            name=user_name,
-            password=user_password,
-            capabilities=["admin"],
-        ),
         crypt_context=await current_config.crypto.crypt_context,
     )