Fix token expiration issue - auto refresh token before expiry
This commit is contained in:
@@ -42,7 +42,7 @@ class Office365Service:
|
||||
self._graph_client = GraphClient(token_manager, self.settings.graph_base_url)
|
||||
return self._graph_client
|
||||
|
||||
def create_user(self, username: str, password: str | None = None, display_name: str | None = None) -> dict[str, Any]:
|
||||
def create_user(self, username: str, password: str | None = None, display_name: str | None = None, retry: bool = True) -> dict[str, Any]:
|
||||
client = self._ensure_client()
|
||||
upn = f"{username}@{self.settings.default_domain}"
|
||||
|
||||
@@ -64,13 +64,15 @@ class Office365Service:
|
||||
try:
|
||||
user = client.create_user(create_payload)
|
||||
except GraphAPIError as exc:
|
||||
if retry and "token is expired" in str(exc).lower():
|
||||
logger.info("Token expired, refreshing and retrying...")
|
||||
self._graph_client.token_manager.clear_token()
|
||||
return self.create_user(username, password, display_name, retry=False)
|
||||
raise self._translate_graph_error(exc, f"创建用户 {upn} 失败")
|
||||
|
||||
license_result = None
|
||||
logger.info(f"Creating user: {upn}, default_license_sku: {self.settings.default_license_sku}")
|
||||
if self.settings.default_license_sku:
|
||||
license_result = self._assign_license(user["id"])
|
||||
logger.info(f"License assignment result: {license_result}")
|
||||
|
||||
return {
|
||||
"user": user,
|
||||
|
||||
Reference in New Issue
Block a user