show InitializedByAnother when compareOwners fails

plgd-dev · Sep 1, 2023 · 6cd3f27 · 6cd3f27
1 parent bef7c4d
commit 6cd3f27
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/http-gateway/web/src/containers/RemoteClients/RemoteClientsPage/RemoteClientsPage.tsx b/http-gateway/web/src/containers/RemoteClients/RemoteClientsPage/RemoteClientsPage.tsx
@@ -72,17 +72,17 @@ const RemoteClientsPage: FC<Props> = (props) => {
         [wellKnownConfig, clientData]
     )
 
-    const compareOwners = useCallback((wellKnownConfig?: WellKnownConfigType) => {
+    const unCompareOwners = useCallback((wellKnownConfig?: WellKnownConfigType) => {
         const userData = clientAppSettings.getUserData()
-        if (userData && wellKnownConfig) {
-            if (!wellKnownConfig.isInitialized) {
-                return true
-            }
+        if (!wellKnownConfig?.isInitialized) {
+            return false
+        }
 
+        if (userData && wellKnownConfig) {
             const parsedData = jwtDecode(userData.access_token)
             const ownerId = get(parsedData, wellKnownConfig?.remoteProvisioning?.jwtOwnerClaim as string, '')
 
-            if (ownerId === wellKnownConfig?.owner) {
+            if (ownerId !== wellKnownConfig?.owner) {
                 return true
             }
         }
@@ -91,22 +91,22 @@ const RemoteClientsPage: FC<Props> = (props) => {
     }, [])
 
     useEffect(() => {
-        if (!compareOwners(wellKnownConfig) && !initializedByAnother) {
+        if (wellKnownConfig && unCompareOwners(wellKnownConfig) && !initializedByAnother) {
             setInitializedByAnother(true)
         }
-    }, [compareOwners, initializedByAnother, wellKnownConfig])
+    }, [unCompareOwners, initializedByAnother, wellKnownConfig])
 
     const unauthorizedCallback = useCallback(() => {
         setSuspectedUnauthorized(true)
 
         reFetchConfig().then((newWellKnownConfig: WellKnownConfigType) => {
-            if (compareOwners(newWellKnownConfig)) {
+            if (!unCompareOwners(newWellKnownConfig)) {
                 setSuspectedUnauthorized(false)
             } else {
                 setInitializedByAnother(true)
             }
         })
-    }, [compareOwners, reFetchConfig])
+    }, [unCompareOwners, reFetchConfig])
 
     const contextValue = useMemo(
         () => ({
@@ -127,7 +127,7 @@ const RemoteClientsPage: FC<Props> = (props) => {
         return <FullPageLoader i18n={{ loading: _(g.loading) }} />
     } else {
         clientAppSettings.setWellKnowConfig(wellKnownConfig)
-        clientAppSettings.setUseToken(compareOwners(wellKnownConfig) && clientData.authenticationMode === DEVICE_AUTH_MODE.X509)
+        clientAppSettings.setUseToken(!unCompareOwners(wellKnownConfig) && clientData.authenticationMode === DEVICE_AUTH_MODE.X509)
 
         if (wellKnownConfig.remoteProvisioning) {
             clientAppSettings.setWebOAuthConfig({