From ef6c708c5684a6ec0047e3e9725d1b2273551f9c Mon Sep 17 00:00:00 2001 From: Munyoki Kilyungi Date: Wed, 13 Mar 2024 13:33:18 +0300 Subject: Rename users -> fetch_users. Use verbs for methods. * gn_auth/auth/authentication/oauth2/models/oauth2client.py (OAuth2Client): (oauth2_clients): Rename users -> fetch_users. * gn_auth/auth/authentication/users.py (users): Ditto. (fetch_users): Ditto. Signed-off-by: Munyoki Kilyungi --- gn_auth/auth/authentication/oauth2/models/oauth2client.py | 4 ++-- gn_auth/auth/authentication/users.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gn_auth') diff --git a/gn_auth/auth/authentication/oauth2/models/oauth2client.py b/gn_auth/auth/authentication/oauth2/models/oauth2client.py index b140a16..1ea7b06 100644 --- a/gn_auth/auth/authentication/oauth2/models/oauth2client.py +++ b/gn_auth/auth/authentication/oauth2/models/oauth2client.py @@ -12,7 +12,7 @@ from pymonad.maybe import Just, Maybe, Nothing from gn_auth.auth.db import sqlite3 as db from gn_auth.auth.authentication.users import (User, - users, + fetch_users, user_by_id, same_password) @@ -236,7 +236,7 @@ def oauth2_clients(conn: db.DbConnection) -> tuple[OAuth2Client, ...]: cursor.execute("SELECT * FROM oauth2_clients") clients_rs = cursor.fetchall() the_users = { - usr.user_id: usr for usr in users( + usr.user_id: usr for usr in fetch_users( conn, tuple({UUID(result["user_id"]) for result in clients_rs})) } diff --git a/gn_auth/auth/authentication/users.py b/gn_auth/auth/authentication/users.py index 2f8caa1..7a41a14 100644 --- a/gn_auth/auth/authentication/users.py +++ b/gn_auth/auth/authentication/users.py @@ -107,7 +107,7 @@ def set_user_password( {"user_id": str(user.user_id), "hash": hashed_password}) return user, hashed_password -def users(conn: db.DbConnection, +def fetch_users(conn: db.DbConnection, ids: tuple[UUID, ...] = tuple()) -> tuple[User, ...]: """ Fetch all users with the given `ids`. If `ids` is empty, return ALL users. -- cgit v1.2.3