diff options
| author | Frederick Muriuki Muriithi | 2023-01-30 03:51:01 +0300 |
|---|---|---|
| committer | Frederick Muriuki Muriithi | 2023-01-30 03:51:01 +0300 |
| commit | a523a767aecb7f1ced67788eda289f0d6c8e30fd (patch) | |
| tree | fe7cb31328c235b21495189c640a69c3a90059c4 /gn3/auth/authorisation/resources.py | |
| parent | 920648f55475ad706828f696141dcd07edb1ef73 (diff) | |
| download | genenetwork3-a523a767aecb7f1ced67788eda289f0d6c8e30fd.tar.gz | |
auth: Do not treat not finding a group as an error
Stop treating not finding a group for a user as an error, since that is an
actual expected state in the system at some point. Rather, restore the use of
Maybe rather than using Either.
We can raise the NotFoundError at the API level rather than at database
retrival level.
Diffstat (limited to 'gn3/auth/authorisation/resources.py')
| -rw-r--r-- | gn3/auth/authorisation/resources.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gn3/auth/authorisation/resources.py b/gn3/auth/authorisation/resources.py index c9cd392..1e37d7a 100644 --- a/gn3/auth/authorisation/resources.py +++ b/gn3/auth/authorisation/resources.py @@ -136,10 +136,6 @@ def user_resources(conn: db.DbConnection, user: User) -> Sequence[Resource]: (private_res + gl_resources + public_resources(conn))# type: ignore[operator] }.values()) - def __handle_error__(exc): - if type(exc) == NotFoundError: - return public_resources(conn) - raise exc # Fix the typing here - return user_group(cursor, user).map(__all_resources__).either(# type: ignore[arg-type,misc] - __handle_error__, lambda res: res)# type: ignore[arg-type,return-value] + return user_group(cursor, user).map(__all_resources__).maybe(# type: ignore[arg-type,misc] + public_resources(conn), lambda res: res)# type: ignore[arg-type,return-value] |