From 2ae541c9b157e9f06d0a148f77bba05deb33669b Mon Sep 17 00:00:00 2001
From: EgleH <egle.helms@gmail.com>
Date: Mon, 23 Jan 2023 14:07:45 +0100
Subject: [PATCH] Fix issue where is_active user & force_change cannot be
 deactivated (#178)

* fix issue where is_active user & force_change cannot be deactivated

* fix API keys not visible for SP users

Co-authored-by: EgleHelms <e.helms@cognigy.com>
---
 .../internal/views/settings/index.tsx         | 23 ++++++++++---------
 src/containers/internal/views/users/form.tsx  |  8 +++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/containers/internal/views/settings/index.tsx b/src/containers/internal/views/settings/index.tsx
index 70aca99..9954a1b 100644
--- a/src/containers/internal/views/settings/index.tsx
+++ b/src/containers/internal/views/settings/index.tsx
@@ -9,7 +9,7 @@ import { ScopedAccess } from "src/components/scoped-access";
 import type { ServiceProvider } from "src/api/types";
 import { Section } from "src/components";
 
-import { USER_ADMIN } from "src/api/constants";
+import { USER_ACCOUNT, USER_ADMIN } from "src/api/constants";
 import { MSG_REQUIRED_FIELDS } from "src/constants";
 import { useSelectState } from "src/store";
 import { Scope } from "src/store/types";
@@ -56,16 +56,17 @@ export const Settings = ({ currentServiceProvider }: SettingsProps) => {
         </form>
       </Section>
 
-      {currentServiceProvider && activeTab === "serviceProvider" && (
-        <ApiKeys
-          key={currentServiceProvider.service_provider_sid}
-          path={`ServiceProviders/${currentServiceProvider.service_provider_sid}/ApiKeys`}
-          post={{
-            service_provider_sid: currentServiceProvider.service_provider_sid,
-          }}
-          label="Service provider"
-        />
-      )}
+      {currentServiceProvider &&
+        (activeTab === "serviceProvider" || user?.scope !== USER_ACCOUNT) && (
+          <ApiKeys
+            key={currentServiceProvider.service_provider_sid}
+            path={`ServiceProviders/${currentServiceProvider.service_provider_sid}/ApiKeys`}
+            post={{
+              service_provider_sid: currentServiceProvider.service_provider_sid,
+            }}
+            label="Service provider"
+          />
+        )}
     </>
   );
 };
diff --git a/src/containers/internal/views/users/form.tsx b/src/containers/internal/views/users/form.tsx
index 16c7053..9c7778a 100644
--- a/src/containers/internal/views/users/form.tsx
+++ b/src/containers/internal/views/users/form.tsx
@@ -138,11 +138,11 @@ export const UserForm = ({ user }: UserFormProps) => {
       }
 
       putUser(user.data.user_sid, {
-        name: name || user.data.name,
-        email: email || user.data.email,
+        name: name,
+        email: email,
         initial_password: initialPassword || null,
-        force_change: forceChange || !!user.data.force_change,
-        is_active: isActive || !!user.data.is_active,
+        force_change: forceChange,
+        is_active: isActive,
         service_provider_sid:
           scope === USER_ADMIN && currentUser?.scope === USER_ADMIN
             ? null