Bluemedia/simple-ocpp-cs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix user limiting filter condition
All checks were successful
ci/woodpecker/push/docker Pipeline was successful
Details

Browse source
This commit is contained in:
Oliver Traber 2025-03-14 00:03:12 +00:00
parent e5c5e94989
commit 46b5040099
Signed by: Bluemedia
GPG key ID: C0674B105057136C
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/app/routers/id_token_v1.py
View file

@ -42,7 +42,7 @@ async def get_id_token(
id_token = result.scalars().first()
if id_token == None:
raise HTTPException(status_code=404, detail="IdToken not found")
if token.role != Role.ADMINISTRATOR & id_token.owner_id != token.subject:
if token.role != Role.ADMINISTRATOR and id_token.owner_id != token.subject:
raise HTTPException(status_code=404, detail="IdToken not found")
return id_token

6
backend/app/routers/transaction_v1.py
View file

@ -44,7 +44,7 @@ async def get_transaction(
transaction = result.scalars().first()
if transaction == None:
raise HTTPException(404, "Transaction not found")
if token.role != Role.ADMINISTRATOR & transaction.user_id != token.subject:
if token.role != Role.ADMINISTRATOR and transaction.user_id != token.subject:
raise HTTPException(404, "Transaction not found")
return transaction
@ -59,7 +59,7 @@ async def get_transaction_meter_values(
transaction = result.scalars().first()
if transaction == None:
raise HTTPException(404, "Transaction not found")
if token.role != Role.ADMINISTRATOR & transaction.user_id != token.subject:
if token.role != Role.ADMINISTRATOR and transaction.user_id != token.subject:
raise HTTPException(404, "Transaction not found")
stmt = select(DbMeterValue).where(DbMeterValue.transaction_id == transaction_id).order_by(DbMeterValue.timestamp)
result = db.execute(stmt)
@ -76,7 +76,7 @@ async def remote_stop_transaction(
transaction = result.scalars().first()
if transaction == None:
raise HTTPException(404, "Transaction not found")
if token.role != Role.ADMINISTRATOR & transaction.user_id != token.subject:
if token.role != Role.ADMINISTRATOR and transaction.user_id != token.subject:
raise HTTPException(404, "Transaction not found")
if transaction.status != TransactionStatus.ONGOING:
raise HTTPException(status_code=422, detail=[{