feat: update get_me to retrieve from kc (#108)

closes #106 
depends on cfpb/regtech-api-commons#12

src/routers/admin.py

@@ -7,19 +7,19 @@
 from regtech_api_commons.api import Router
 from entities.models import UserProfile
 
-from regtech_api_commons.models.auth import AuthenticatedUser
-from regtech_api_commons.oauth2.oauth2_admin import OAuth2Admin
+from regtech_api_commons.models import RegTechUser
+from regtech_api_commons.oauth2 import OAuth2Admin
 from config import kc_settings
 
 router = Router()
 
 oauth2_admin = OAuth2Admin(kc_settings)
 
 
-@router.get("/me/", response_model=AuthenticatedUser)
+@router.get("/me/", response_model=RegTechUser)
 @requires("authenticated")
 def get_me(request: Request):
-    return request.user
+    return oauth2_admin.get_user(request.user.id)
 
 
 @router.put("/me/", status_code=HTTPStatus.ACCEPTED, dependencies=[Depends(check_domain)])

tests/api/conftest.py

@@ -4,7 +4,7 @@
 from fastapi import FastAPI
 from pytest_mock import MockerFixture
 from starlette.authentication import AuthCredentials, UnauthenticatedUser
-from regtech_api_commons.models.auth import AuthenticatedUser
+from regtech_api_commons.models import AuthenticatedUser
 from entities.models import (
     FinancialInstitutionDao,
     FinancialInstitutionDomainDao,
@@ -37,7 +37,6 @@ def auth_mock(mocker: MockerFixture) -> Mock:
 @pytest.fixture
 def authed_user_mock(auth_mock: Mock) -> Mock:
     claims = {
-        "id": "test_user_id",
         "name": "test",
         "preferred_username": "test_user",
         "email": "[email protected]",

tests/api/routers/test_admin_api.py

@@ -5,7 +5,7 @@
 from pytest_mock import MockerFixture
 from starlette.authentication import AuthCredentials
 
-from regtech_api_commons.models.auth import AuthenticatedUser
+from regtech_api_commons.models import RegTechUser, AuthenticatedUser
 
 
 class TestAdminApi:
@@ -15,13 +15,16 @@ def test_get_me_unauthed(self, app_fixture: FastAPI, unauthed_user_mock: Mock):
         assert res.status_code == 403
 
     def test_get_me_authed(self, mocker: MockerFixture, app_fixture: FastAPI, authed_user_mock: Mock):
+        get_user_mock = mocker.patch("regtech_api_commons.oauth2.OAuth2Admin.get_user")
+        get_user_mock.return_value = authed_user_mock.return_value[1]
         client = TestClient(app_fixture)
         res = client.get("/v1/admin/me")
+        get_user_mock.assert_called_once_with("testuser123")
         assert res.status_code == 200
         assert res.json().get("name") == "test"
         assert res.json().get("institutions") == []
 
-    def test_get_me_authed_with_institutions(self, app_fixture: FastAPI, auth_mock: Mock):
+    def test_get_me_authed_with_institutions(self, mocker: MockerFixture, app_fixture: FastAPI, auth_mock: Mock):
         claims = {
             "name": "test",
             "preferred_username": "test_user",
@@ -33,6 +36,8 @@ def test_get_me_authed_with_institutions(self, app_fixture: FastAPI, auth_mock:
             AuthCredentials(["authenticated"]),
             AuthenticatedUser.from_claim(claims),
         )
+        get_user_mock = mocker.patch("regtech_api_commons.oauth2.OAuth2Admin.get_user")
+        get_user_mock.return_value = RegTechUser.from_claim(claims)
         client = TestClient(app_fixture)
         res = client.get("/v1/admin/me")
         assert res.status_code == 200