ben.carrasco/jambonz-webapp
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-webapp.git synced 2026-07-04 19:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where is_active user & force_change cannot be deactivated (#178)

Browse Source 
* 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>
This commit is contained in:
EgleH
2023-01-23 14:07:45 +01:00
committed by GitHub
parent 4149930945
commit 2ae541c9b1
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/containers/internal/views/settings/index.tsx
+12 -11
View File
@@ -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"
/>
)}
</>
);
};
src/containers/internal/views/users/form.tsx
+4 -4
View File
@@ -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