User type updates

Author: axelstudios

package.json

@@ -1,6 +1,6 @@
 {
   "name": "seed",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "Standard Energy Efficiency Data (SEED) Platform™",
   "license": "SEE LICENSE IN LICENSE.md",
   "packageManager": "pnpm@10.0.0",

proxy.conf.mjs

@@ -3,7 +3,7 @@ import { config } from '@dotenvx/dotenvx'
 config({ quiet: true })
 
 export default {
-  '/api': {
+  '/api/': {
     target: process.env.SEED_HOST ?? 'http://127.0.0.1:8000',
     changeOrigin: true,
     logLevel: 'debug',

src/@seed/api/user/user.types.ts

@@ -1,21 +1,22 @@
 export type UserRole = 'viewer' | 'member' | 'owner'
 
 export type CurrentUser = {
+  first_name: string;
+  last_name: string;
+  email: string;
+  username: string;
+  api_key: string;
+  is_superuser: boolean;
+  id: number;
+  pk: number;
+  two_factor_method: 'disabled' | 'email' | 'token';
   org_id: number;
   org_name: string;
   org_role: UserRole;
   ali_name: string;
   ali_id: number;
   is_ali_root: boolean;
   is_ali_leaf: boolean;
-  pk: number;
-  id: number;
-  first_name: string;
-  last_name: string;
-  email: string;
-  username: string;
-  is_superuser: boolean;
-  api_key: string;
 }
 
 export type SetDefaultOrganizationResponse = {

src/@seed/components/navigation/horizontal/components/branch/branch.component.ts

@@ -1,7 +1,7 @@
 import type { BooleanInput } from '@angular/cdk/coercion'
 import { NgClass, NgTemplateOutlet } from '@angular/common'
 import type { OnDestroy, OnInit } from '@angular/core'
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, inject, Input, viewChild } from '@angular/core'
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, viewChild } from '@angular/core'
 import { MatIconModule } from '@angular/material/icon'
 import type { MatMenu } from '@angular/material/menu'
 import { MatMenuModule } from '@angular/material/menu'
@@ -22,7 +22,6 @@ import type { NavigationItem } from '@seed/components/navigation/navigation.type
     MatMenuModule,
     NgTemplateOutlet,
     HorizontalNavigationBasicItemComponent,
-    forwardRef(() => HorizontalNavigationBranchItemComponent),
     HorizontalNavigationDividerItemComponent,
     MatTooltipModule,
     MatIconModule,

src/@seed/components/navigation/vertical/components/collapsible/collapsible.component.ts

@@ -1,7 +1,7 @@
 import type { BooleanInput } from '@angular/cdk/coercion'
 import { NgClass } from '@angular/common'
 import type { OnDestroy, OnInit } from '@angular/core'
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, HostBinding, inject, Input } from '@angular/core'
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, inject, Input } from '@angular/core'
 import { MatIconModule } from '@angular/material/icon'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import { NavigationEnd, Router } from '@angular/router'
@@ -27,7 +27,6 @@ import { exactMatchOptions, subsetMatchOptions } from '@seed/utils'
     MatTooltipModule,
     MatIconModule,
     VerticalNavigationBasicItemComponent,
-    forwardRef(() => VerticalNavigationCollapsibleItemComponent),
     VerticalNavigationDividerItemComponent,
     VerticalNavigationGroupItemComponent,
     VerticalNavigationSpacerItemComponent,

src/@seed/components/navigation/vertical/components/group/group.component.ts

@@ -1,7 +1,7 @@
 import type { BooleanInput } from '@angular/cdk/coercion'
 import { NgClass } from '@angular/common'
 import type { OnDestroy, OnInit } from '@angular/core'
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, inject, Input } from '@angular/core'
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input } from '@angular/core'
 import { MatIconModule } from '@angular/material/icon'
 import { Subject, takeUntil } from 'rxjs'
 import type { NavigationItem, VerticalNavigationComponent } from '@seed/components'
@@ -23,7 +23,6 @@ import {
     VerticalNavigationBasicItemComponent,
     VerticalNavigationCollapsibleItemComponent,
     VerticalNavigationDividerItemComponent,
-    forwardRef(() => VerticalNavigationGroupItemComponent),
     VerticalNavigationSpacerItemComponent,
   ],
 })

src/app/mock-api/common/user/data.ts

@@ -1,19 +1,20 @@
 import type { CurrentUser } from '@seed/api/user'
 
 export const user: CurrentUser = {
+  first_name: 'Alex',
+  last_name: 'Swindler',
+  email: 'Alex.Swindler@nrel.gov',
+  username: 'alex.swindler@nrel.gov',
+  api_key: '226347f24542d889e2f76c043696cfd21d1e0556',
+  is_superuser: true,
+  id: 1,
+  pk: 1,
+  two_factor_method: 'disabled',
   org_id: 1,
   org_name: 'NREL',
   org_role: 'owner',
   ali_name: 'root',
   ali_id: 1,
   is_ali_root: true,
   is_ali_leaf: true,
-  pk: 1,
-  id: 1,
-  first_name: 'Alex',
-  last_name: 'Swindler',
-  email: 'Alex.Swindler@nrel.gov',
-  username: 'alex.swindler@nrel.gov',
-  is_superuser: true,
-  api_key: '226347f24542d889e2f76c043696cfd21d1e0556',
 }