niu/mdrs-client-python
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed API endpoint from v2 to v3.

Browse Source
This commit is contained in:
Yoshihiro OKUMURA
2023-12-12 20:05:46 +09:00
parent f10b42a1f2
commit 292ca1df27
19 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mdrsclient/api/users.py
View File

@ -1,4 +1,3 @@
from dataclasses import field
from typing import Final
import requests
@ -7,13 +6,7 @@ from pydantic.dataclasses import dataclass
from mdrsclient.api.base import BaseApi
from mdrsclient.exceptions import UnauthorizedException
from mdrsclient.models import Laboratory, Token, User
@dataclass(frozen=True)
class UserAuthResponse(Token):
is_reviewer: bool | None = None
laboratories: list[Laboratory] = field(default_factory=list)
from mdrsclient.models import Token, User
@dataclass(frozen=True)
@ -24,7 +17,7 @@ class UsersCurrentResponseLaboratory:
@dataclass(frozen=True)
class UsersCurrentResponse:
class UsersApiCurrentResponse:
id: int
username: str
full_name: str
@ -39,21 +32,21 @@ class UsersCurrentResponse:
class UsersApi(BaseApi):
ENTRYPOINT: Final[str] = "v2/"
ENTRYPOINT: Final[str] = "v3/users/"
def current(self) -> User:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + "users/current/"
url = self.ENTRYPOINT + "current/"
response = self.connection.get(url)
self._raise_response_error(response)
obj = TypeAdapter(UsersCurrentResponse).validate_python(response.json())
obj = TypeAdapter(UsersApiCurrentResponse).validate_python(response.json())
laboratory_ids = list(map(lambda x: x.id, obj.laboratories))
user = User(id=obj.id, username=obj.username, laboratory_ids=laboratory_ids, is_reviewer=obj.is_reviewer)
return user
def token(self, username: str, password: str) -> Token:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + "users/token/"
url = self.ENTRYPOINT + "token/"
data: dict[str, str | int] = {"username": username, "password": password}
response = self.connection.post(url, data=data)
if response.status_code == requests.codes.unauthorized:
@ -64,7 +57,7 @@ class UsersApi(BaseApi):
def tokenRefresh(self, token: Token) -> Token:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + "users/token/refresh/"
url = self.ENTRYPOINT + "token/refresh/"
data: dict[str, str | int] = {"refresh": token.refresh}
response = self.connection.post(url, data=data)
if response.status_code == requests.codes.unauthorized: