From a523a767aecb7f1ced67788eda289f0d6c8e30fd Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Mon, 30 Jan 2023 03:51:01 +0300 Subject: 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. --- gn3/auth/authorisation/resources.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gn3/auth/authorisation/resources.py') 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] -- cgit v1.2.3