From 9367464d2059031e1302dbe2df54c182a480ede1 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Thu, 30 Jun 2022 10:42:41 -0400
Subject: [PATCH] Fleet Desktop Device User Page: Remove unnecessary API call
 (#6427)

---
 changes/issue-6072-device-user-no-enroll-secret-api | 1 +
 frontend/components/App/App.tsx                     | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changes/issue-6072-device-user-no-enroll-secret-api

diff --git a/changes/issue-6072-device-user-no-enroll-secret-api b/changes/issue-6072-device-user-no-enroll-secret-api
new file mode 100644
index 0000000000..7d4db5b4f2
--- /dev/null
+++ b/changes/issue-6072-device-user-no-enroll-secret-api
@@ -0,0 +1 @@
+* Remove unnecessary call to enroll secret API on device user page when logged in
\ No newline at end of file
diff --git a/frontend/components/App/App.tsx b/frontend/components/App/App.tsx
index 7dac815d1d..74e18927c2 100644
--- a/frontend/components/App/App.tsx
+++ b/frontend/components/App/App.tsx
@@ -84,7 +84,7 @@ const App = ({ children, location, router }: IAppProps): JSX.Element => {
   };
 
   useEffect(() => {
-    if (authToken()) {
+    if (authToken() && !location?.pathname.includes("/device/")) {
       fetchCurrentUser();
     }
   }, [location?.pathname]);
@@ -97,7 +97,8 @@ const App = ({ children, location, router }: IAppProps): JSX.Element => {
       typeof isOnlyObserver !== "undefined" &&
       !isOnlyObserver &&
       typeof isAnyTeamMaintainerOrTeamAdmin !== "undefined" &&
-      !isAnyTeamMaintainerOrTeamAdmin;
+      !isAnyTeamMaintainerOrTeamAdmin &&
+      !location?.pathname.includes("/device/");
 
     const getEnrollSecret = async () => {
       try {