update profile on token refresh

Houston-ARTCC · Mar 26, 2024 · bca6ac9 · bca6ac9
1 parent d731255
commit bca6ac9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/next.config.js b/next.config.js
@@ -5,6 +5,10 @@ const nextConfig = {
     output: 'standalone',
     images: {
         remotePatterns: [
+            {
+                protocol: 'http',
+                hostname: 'localhost',
+            },
             {
                 protocol: 'https',
                 hostname: 'api.houston.center',

diff --git a/src/app/admin/purge/PurgeTable.tsx b/src/app/admin/purge/PurgeTable.tsx
@@ -127,13 +127,13 @@ export const PurgeView: React.FC<PurgeViewProps> = ({ data }) => {
                     },
                     {
                         name: 'Tier 1',
-                        selector: (user) => user.t1_active ?? '',
+                        selector: (user) => user.t1_hours ?? '',
                         sortable: true,
                         sortFunction: (a, b) => durationToSeconds(a.t1_hours) - durationToSeconds(b.t1_hours),
                         cell: (user) => (
                             <div className={classNames('flex items-center', { 'text-green-500': user.t1_active })}>
                                 {user.t1_active && <LuCheck size={20} />}
-                                <p className="w-14 text-right">{user.t1_active}</p>
+                                <p className="w-14 text-right">{user.t1_hours}</p>
                             </div>
                         ),
                         width: '125px',

diff --git a/src/app/roster/RosterTable.tsx b/src/app/roster/RosterTable.tsx
@@ -93,16 +93,16 @@ export const RosterView: React.FC<RosterViewProps> = ({ data }) => {
                     sortable: true,
                 },
                 {
-                    name: 'Unrestricted',
+                    name: 'Unrstd.',
                     sortable: true,
                     sortFunction: sortUnrestricted,
                     cell: (user) => {
                         if (user.endorsements.app) return <EndorsementBadge tier={0} name="APP" status={user.endorsements.app} />;
                         if (user.endorsements.twr) return <EndorsementBadge tier={0} name="TWR" status={user.endorsements.twr} />;
                         return <EndorsementBadge tier={0} name="GND" status={user.endorsements.gnd} />;
                     },
-                    width: '130px',
-                    right: true,
+                    width: '110px',
+                    center: true,
                 },
                 {
                     name: 'HOU T1',
@@ -114,7 +114,7 @@ export const RosterView: React.FC<RosterViewProps> = ({ data }) => {
                         return <EndorsementBadge tier={1} name="HOU" status={false} />;
                     },
                     width: '110px',
-                    right: true,
+                    center: true,
                 },
                 {
                     name: 'IAH T1',
@@ -126,7 +126,7 @@ export const RosterView: React.FC<RosterViewProps> = ({ data }) => {
                         return <EndorsementBadge tier={1} name="IAH" status={false} />;
                     },
                     width: '110px',
-                    right: true,
+                    center: true,
                 },
                 {
                     name: 'I90 T1',
@@ -137,15 +137,15 @@ export const RosterView: React.FC<RosterViewProps> = ({ data }) => {
                         return <EndorsementBadge tier={1} name="I90" status={false} />;
                     },
                     width: '110px',
-                    right: true,
+                    center: true,
                 },
                 {
                     name: 'ZHU',
                     sortable: true,
                     sortFunction: sortZHU,
                     cell: (user) => <EndorsementBadge tier={2} name="ZHU" status={user.endorsements.zhu} />,
                     width: '110px',
-                    right: true,
+                    center: true,
                 },
             ]}
         />

diff --git a/src/app/visit/VisitForm.tsx b/src/app/visit/VisitForm.tsx
@@ -70,7 +70,7 @@ export const VisitForm: React.FC = () => {
                         className="col-span-3"
                         disabled
                         label="Home Facility"
-                        value={session.user.facility}
+                        value={session.user.home_facility}
                     />
                     <TextInput
                         className="col-span-3"

diff --git a/src/types/next-auth.d.ts b/src/types/next-auth.d.ts
@@ -7,7 +7,7 @@ type UserId = {
     cid: number;
     email: string;
     rating: string;
-    facility: string;
+    home_facility: string;
     permissions: {
         is_member: boolean;
         is_training_staff: boolean;

diff --git a/src/utils/auth.ts b/src/utils/auth.ts
@@ -1,9 +1,10 @@
-import { type AuthOptions } from 'next-auth';
-import { type UserId } from '@/types/next-auth';
+import type { AuthOptions } from 'next-auth';
+import type { UserId } from '@/types/next-auth';
 
 type RefreshedTokens = {
     access: string;
     refresh: string;
+    profile: UserId;
 }
 
 type JWTPayload = {
@@ -58,15 +59,20 @@ export const authOptions: AuthOptions = {
             if (Date.now() / 1000 > token.account.access_token_exp) {
                 const body = JSON.stringify({ refresh: token.account.refresh_token });
 
-                const refreshResp = await fetch(
+                // Obtain new token pair and new profile data
+                const { access, refresh, profile } = await fetch(
                     `${process.env.NEXT_PUBLIC_API_URL}/auth/token/refresh/`,
-                    { method: 'POST', headers: { 'Content-Type': 'application/json' }, body },
-                );
-
-                const { access, refresh } = await refreshResp.json() as RefreshedTokens;
+                    {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body,
+                    },
+                )
+                    .then<RefreshedTokens>((resp) => resp.json());
 
                 return {
                     ...token,
+                    user: profile,
                     account: {
                         ...token.account,
                         access_token: access,