Hesham/ibs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sql_app: main: Add tags and base url for admin/user

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2022-04-13 07:05:44 +03:00
parent 08b8aafcf0
commit 40d981a4cd
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sql_app/main.py
View File

@ -48,7 +48,7 @@ async def get_current_active_user(current_user: schemas.User = Depends(get_curre
raise HTTPException(status_code=400, detail="Inactive user") raise HTTPException(status_code=400, detail="Inactive user")
return current_user return current_user
@app.post("/users/reg", response_model=schemas.User, tags=['users']) @app.post("/users/reg", response_model=schemas.User, tags=['Users'])
def create_user(user: schemas.UserCreate, db: Session = Depends(get_db)): def create_user(user: schemas.UserCreate, db: Session = Depends(get_db)):
db_user = crud.get_user_by_email(db, email=user.email) db_user = crud.get_user_by_email(db, email=user.email)
if db_user: if db_user:
@ -61,13 +61,17 @@ def create_user(user: schemas.UserCreate, db: Session = Depends(get_db)):
return crud.create_user(db=db, user=user) return crud.create_user(db=db, user=user)
@app.get("/users/", response_model=List[schemas.User]) @app.get("/admin/users/", response_model=List[schemas.User], tags=['Admin'])
def read_users(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)): def read_users(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
users = crud.get_users(db, skip=skip, limit=limit) users = crud.get_users(db, skip=skip, limit=limit)
return users return users
@app.get("/admin/iotentities/", response_model=List[schemas.IotEntity], tags=['Admin'])
def read_iot_entities(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
iot_entities = crud.get_iot_entities(db, skip=skip, limit=limit)
return iot_entities
@app.get("/users/{user_id}", response_model=schemas.User) @app.get("/admin/users/{user_id}", response_model=schemas.User, tags=['Admin'])
def read_user(user_id: int, db: Session = Depends(get_db)): def read_user(user_id: int, db: Session = Depends(get_db)):
db_user = crud.get_user(db, user_id=user_id) db_user = crud.get_user(db, user_id=user_id)
if db_user is None: if db_user is None:
@ -75,19 +79,13 @@ def read_user(user_id: int, db: Session = Depends(get_db)):
return db_user return db_user
@app.post("/users/{user_id}/items/", response_model=schemas.IotEntity) @app.get("/users/acesslist/", response_model=List[schemas.IotEntity], tags=['Users'])
def create_item_for_user( def get_iot_access_list_for_user(db: Session = Depends(get_db), current_user: schemas.User = Depends(get_current_active_user)):
user_id: int, item: schemas.IotEntityCreate, db: Session = Depends(get_db) user = crud.get_user_by_username(db, current_user.username)
): return user.authorized_devices
return crud.create_user_item(db=db, item=item, user_id=user_id)
@app.get("/items", response_model=List[schemas.IotEntity]) @app.post("/tkn", response_model=schemas.Token, tags=['Users'])
def read_items(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
items = crud.get_items(db, skip=skip, limit=limit)
return items
@app.post("/tkn", response_model=schemas.Token)
async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)): async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)):
user = auth_helper.authenticate_user(db, form_data.username, form_data.password) user = auth_helper.authenticate_user(db, form_data.username, form_data.password)
if not user: if not user:
@ -102,8 +100,8 @@ async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends(
) )
return {"access_token": access_token, "token_type": "bearer"} return {"access_token": access_token, "token_type": "bearer"}
@app.get("/users/me/", response_model=schemas.User) @app.get("/users/me/", response_model=schemas.User, tags=['Users'])
async def read_users_me(current_user: schemas.User = Depends(get_current_active_user)): async def get_user_details(current_user: schemas.User = Depends(get_current_active_user)):
return current_user return current_user