diff --git a/src/blueapi/config.py b/src/blueapi/config.py index a181f4c344..44c322fc2f 100644 --- a/src/blueapi/config.py +++ b/src/blueapi/config.py @@ -236,26 +236,20 @@ class OIDCConfig(BlueapiBaseModel): @model_validator(mode="after") def check_urls(self) -> Self: - if self.issuer is None and self.well_known_url is None: + if self.issuer is None and self.__dict__.get("well_known_url") is None: raise ValueError("Please provide 'OIDCConfig.issuer'") - if self.well_known_url: + if self.__dict__.get("well_known_url"): LOGGER.warning( - DeprecationWarning( - "OIDCConfig.well_known_url is deprecated, " - "Please use OIDCConfig.issuer" - ), + "OIDCConfig.well_known_url is deprecated, Please use OIDCConfig.issuer" ) return self @cached_property def _well_known_url(self) -> str: if self.issuer: - if self.well_known_url: + if self.__dict__.get("well_known_url"): LOGGER.warning( - DeprecationWarning( - "well_known_url and issuer are both set. " - "Defaulting to issuer URL" - ), + "well_known_url and issuer are both set. Defaulting to issuer URL" ) return self.issuer + "/.well-known/openid-configuration" return cast(str, self.well_known_url)