user to only username
This commit is contained in:
@@ -211,12 +211,7 @@ async def swipe(request):
|
|||||||
"timestamp": timestamp,
|
"timestamp": timestamp,
|
||||||
"door": data["door"],
|
"door": data["door"],
|
||||||
"approved": data["approved"],
|
"approved": data["approved"],
|
||||||
"user": {
|
"user": token.get("inventory", {}).get("owner", {}).get("username", ""),
|
||||||
"id": token.get("inventory", {}).get("owner", {}).get("username", ""),
|
|
||||||
"name": token.get("inventory", {})
|
|
||||||
.get("owner", {})
|
|
||||||
.get("display_name", "Unclaimed Token"),
|
|
||||||
},
|
|
||||||
"uid_hash": data["uid_hash"],
|
"uid_hash": data["uid_hash"],
|
||||||
}
|
}
|
||||||
await request.app.ctx.db.doorlog.insert_one(event_swipe)
|
await request.app.ctx.db.doorlog.insert_one(event_swipe)
|
||||||
|
|||||||
10
app/slack.py
10
app/slack.py
@@ -55,7 +55,7 @@ async def slack_log_fwd(app, loop):
|
|||||||
msg = "%s %s access for %s via %s" % (
|
msg = "%s %s access for %s via %s" % (
|
||||||
approvedStr(ev["approved"]),
|
approvedStr(ev["approved"]),
|
||||||
ev["door"],
|
ev["door"],
|
||||||
ev["user"]["name"],
|
ev["user"],
|
||||||
ev["method"],
|
ev["method"],
|
||||||
)
|
)
|
||||||
slack_post(msg)
|
slack_post(msg)
|
||||||
@@ -126,16 +126,14 @@ async def slack_open(request):
|
|||||||
"timestamp": datetime.now(timezone.utc),
|
"timestamp": datetime.now(timezone.utc),
|
||||||
"door": d,
|
"door": d,
|
||||||
"approved": True,
|
"approved": True,
|
||||||
"user": {
|
"user": userOrErrorMsg,
|
||||||
"id": userOrErrorMsg,
|
|
||||||
"name": request.form.get("user_name"),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
if userOrErrorMsg.startswith("🖕"):
|
if userOrErrorMsg.startswith("🖕"):
|
||||||
slackId = userOrErrorMsg.removeprefix("🖕 ")
|
slackId = userOrErrorMsg.removeprefix("🖕 ")
|
||||||
print(f"WARN: slack #members open with unlinked ID {slackId}")
|
slackIdReadable = request.form.get("user_name") # this can be changed by user
|
||||||
|
print(f"WARN: slack #members open with unlinked ID {slackId}, slack u/n: {slackIdReadable}")
|
||||||
return text(f"Opening {door}… This will stop working! Your Slack ID {slackId} is not linked with auth.k-space.ee, please notify info@k-space.ee.")
|
return text(f"Opening {door}… This will stop working! Your Slack ID {slackId} is not linked with auth.k-space.ee, please notify info@k-space.ee.")
|
||||||
|
|
||||||
return text(f"Opening {door}…")
|
return text(f"Opening {door}…")
|
||||||
|
|||||||
Reference in New Issue
Block a user