remove old temporary Login views, utilize built in dj-rest-auth views

client/src/features/Profile/Profile.tsx

@@ -1,38 +1,28 @@
 import { UserOrg } from 'components/Org';
 import { RcraProfile } from 'components/RcraProfile';
-import { HtCard } from 'components/UI';
+import { HtCard, HtSpinner } from 'components/UI';
 import { UserInfoForm } from 'components/User';
 import { useTitle } from 'hooks';
-import React, { ReactElement, useEffect } from 'react';
+import React, { ReactElement } from 'react';
 import { Col, Container, Row } from 'react-bootstrap';
-import {
-  getRcraProfile,
-  HaztrakUser,
-  selectHaztrakProfile,
-  selectUser,
-  useAppDispatch,
-  useAppSelector,
-} from 'store';
+import { selectHaztrakProfile, useAppSelector, useGetUserQuery } from 'store';
 
 /**
  * Display user profile, including their Haztrak information, their organization,
  * and their RCRAInfo profile.
  * @constructor
  */
 export function Profile(): ReactElement {
-  const dispatch = useAppDispatch();
   const profile = useAppSelector(selectHaztrakProfile);
-  const user: HaztrakUser | undefined = useAppSelector(selectUser);
+  const { data: user, isLoading } = useGetUserQuery();
   useTitle('Profile');
 
-  if (!user) {
-    return <div>loading...</div>;
+  if (isLoading) {
+    return <HtSpinner center />;
+  } else if (!user) {
+    return <div>Unable to load user profile.</div>;
   }
 
-  useEffect(() => {
-    dispatch(getRcraProfile());
-  }, [profile.user]);
-
   return (
     <>
       <Container fluid className="py-2">

client/src/store/authSlice/auth.slice.ts

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { RootState } from 'store/rootStore';
 import { haztrakApi } from 'store/haztrakApiSlice';
+import { RootState } from 'store/rootStore';
 
 export interface HaztrakUser {
   username: string;
@@ -82,7 +82,7 @@ export const authApi = haztrakApi.injectEndpoints({
     // Note: build.query<ReturnType, ArgType>
     login: build.mutation<LoginResponse, LoginRequest>({
       query: (data) => ({
-        url: 'auth/login',
+        url: 'user/login',
         method: 'POST',
         data: data,
       }),

server/apps/core/serializers.py

@@ -14,6 +14,7 @@ class HaztrakUserSerializer(ModelSerializer):
     Model serializer for marshalling/unmarshalling a user's HaztrakUser
     """
 
+    id = serializers.CharField(source="pk")
     username = serializers.CharField(
         required=False,
     )
@@ -29,6 +30,7 @@ class HaztrakUserSerializer(ModelSerializer):
     class Meta:
         model = HaztrakUser
         fields = [
+            "id",
             "username",
             "firstName",
             "lastName",

server/apps/core/urls.py

@@ -1,10 +1,9 @@
+from dj_rest_auth.views import LoginView, LogoutView, UserDetailsView
 from django.urls import include, path
 
 from .views import (  # type: ignore
     HaztrakProfileView,
-    HaztrakUserView,
     LaunchExampleTaskView,
-    Login,
     RcraProfileView,
     SyncRcraProfileView,
     TaskStatusView,
@@ -21,9 +20,17 @@
             ]
         ),
     ),
-    path("profile", HaztrakProfileView.as_view()),
-    path("user", HaztrakUserView.as_view()),
-    path("user/login", Login.as_view()),
     path("task/example", LaunchExampleTaskView.as_view()),
     path("task/<str:task_id>", TaskStatusView.as_view()),
+    path("profile", HaztrakProfileView.as_view()),
+    path(
+        "user",
+        include(
+            [
+                path("", UserDetailsView.as_view(), name="rest_user_details"),
+                path("/login", LoginView.as_view(), name="rest_login"),
+                path("/logout", LogoutView.as_view(), name="rest_logout"),
+            ]
+        ),
+    ),
 ]

server/apps/core/views/__init__.py

@@ -1,7 +1,5 @@
-from .auth_view import Login
 from .profile_views import (
     HaztrakProfileView,
-    HaztrakUserView,
     RcraProfileView,
     SyncRcraProfileView,
 )

server/apps/core/views/profile_views.py

@@ -5,25 +5,14 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from apps.core.models import HaztrakProfile, HaztrakUser, RcraProfile
+from apps.core.models import HaztrakProfile, RcraProfile
 from apps.core.serializers import (
     HaztrakProfileSerializer,
-    HaztrakUserSerializer,
     RcraProfileSerializer,
 )
 from apps.site.tasks import sync_user_rcrainfo_sites
 
 
-class HaztrakUserView(RetrieveUpdateAPIView):
-    """Retrieve the current user's base information"""
-
-    queryset = HaztrakUser.objects.all()
-    serializer_class = HaztrakUserSerializer
-
-    def get_object(self):
-        return self.request.user
-
-
 class HaztrakProfileView(RetrieveAPIView):
     """Displays a user's HaztrakProfile"""
 

server/haztrak/settings/base.py

@@ -221,3 +221,5 @@
         },
     },
 }
+
+REST_AUTH = {"USER_DETAILS_SERIALIZER": "apps.core.serializers.HaztrakUserSerializer"}

server/haztrak/urls.py

@@ -13,7 +13,6 @@
     1. Import the 'include()' function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from dj_rest_auth.views import LoginView, LogoutView, UserDetailsView
 from django.contrib import admin
 from django.urls import include, path
 from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
@@ -38,16 +37,6 @@
                     name="swagger-ui",
                 ),
                 path(r"health/", include("health_check.urls")),
-                path(
-                    "auth/",
-                    include(
-                        [
-                            path("login", LoginView.as_view(), name="rest_login"),
-                            path("logout", LogoutView.as_view(), name="rest_logout"),
-                            path("user", UserDetailsView.as_view(), name="rest_user_details"),
-                        ]
-                    ),
-                ),
             ]
         ),
     ),