From 49425e637a27317fe1dab0bd656a11d7fbb2693d Mon Sep 17 00:00:00 2001 From: Andrea Mistrali Date: Thu, 4 Jul 2024 13:50:32 +0200 Subject: [PATCH] Version 1.0 --- hsapi/hsapi/preauthkeys.py | 2 +- hsapi/hsapi/schemas.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hsapi/hsapi/preauthkeys.py b/hsapi/hsapi/preauthkeys.py index 117092f..01a4747 100644 --- a/hsapi/hsapi/preauthkeys.py +++ b/hsapi/hsapi/preauthkeys.py @@ -16,7 +16,7 @@ class v1PreAuthKeyResponse(BaseModel): class v1ExpirePreAuthKeyRequest(BaseModel): user: str = Field(alias="user", default=None) - key: int = Field(alias="key", default=None) + key: str = Field(alias="key", default=None) class v1CreatePreAuthKeyRequest(BaseModel): diff --git a/hsapi/hsapi/schemas.py b/hsapi/hsapi/schemas.py index 025980b..3b309a7 100644 --- a/hsapi/hsapi/schemas.py +++ b/hsapi/hsapi/schemas.py @@ -45,7 +45,10 @@ class v1PreAuthKey(BaseModel): def expired(self) -> bool: tzinfo = timezone(timedelta(hours=0)) # UTC now = datetime.now(tzinfo) - return self.expiration < now # type: ignore + exptime = self.expiration < now + expused = not self.reusable and self.used + expephemereal = self.ephemeral and self.used + return exptime or expused or expephemereal class v1User(BaseModel):