257 user model refactor the config handling #433
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
msm-cert
requested changes
Oct 30, 2024
src/db.py
Outdated
Comment on lines
90
to
93
| auth_enabled = self.db.get_mquery_config_key("auth_enabled") | ||
| if not auth_enabled or auth_enabled == "false": | ||
| return False | ||
| return True |
There was a problem hiding this comment.
Suggested change
| auth_enabled = self.db.get_mquery_config_key("auth_enabled") | |
| if not auth_enabled or auth_enabled == "false": | |
| return False | |
| return True | |
| return self.db.get_mquery_config_key("auth_enabled") == "true" |
Tiny chance in behaviour, but consistent with query_allow_slow (and works the same way for "true" and "false")
src/db.py
Outdated
| ] | ||
|
|
||
| @property | ||
| def openid_client_id(self) -> str: |
There was a problem hiding this comment.
Suggested change
| def openid_client_id(self) -> str: | |
| def openid_client_id(self) -> str | None: |
There was a problem hiding this comment.
(if this causes type errors somewhere else, callers should be fixed to handle the situation where this is null)
src/db.py
Outdated
| return True | ||
|
|
||
| @property | ||
| def openid_url(self) -> str: |
There was a problem hiding this comment.
Suggested change
| def openid_url(self) -> str: | |
| def openid_url(self) -> str | None: |
src/schema.py
Outdated
| @@ -101,7 +101,7 @@ class BackendStatusDatasetsSchema(BaseModel): | |||
|
|
|||
| class ServerSchema(BaseModel): | |||
| version: str | |||
| auth_enabled: Optional[str] | |||
| auth_enabled: Optional[bool] | |||
There was a problem hiding this comment.
I suspect this will cause issues on the frontend (but you can check). Unfortunately, you should probably cast to str when creating ServerSchema.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Your checklist for this pull request
What is the current behaviour?
db.get_mquery_config_key("default_role) when called returns different types
What is the new behaviour?
I created UserModelConfig with properties like auth_default_roles, openid_client_id, query_allow_slow etc. and now i call db.config.default_role
Test plan
Closing issues
fixes #257