libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Prefer optional chaining over validating references (#992)

Browse source
This commit is contained in:
Jon Koops 2021-08-12 13:15:47 +02:00 committed by GitHub
parent 6f29839b06
commit 317acd8239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 110 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.js
View file

@ -17,6 +17,8 @@ module.exports = {
},
},
rules: {
// Always prefer using an optional chain expression, as it's more concise and easier to read.
"@typescript-eslint/prefer-optional-chain": "error",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-empty-function": "error",

15
src/clients/ClientSettings.tsx
View file

@ -175,14 +175,13 @@ export const ClientSettings = ({ save, reset }: ClientSettingsProps) => {
{t("common:choose")}
</SelectOption>
<>
{loginThemes &&
loginThemes.map((theme) => (
<SelectOption
selected={theme.name === value}
key={theme.name}
value={theme.name}
/>
))}
{loginThemes?.map((theme) => (
<SelectOption
selected={theme.name === value}
key={theme.name}
value={theme.name}
/>
))}
</>
</Select>
)}

4
src/clients/credentials/X509.tsx
View file

@ -20,7 +20,7 @@ export const X509 = () => {
}
helperTextInvalid={t("common:required")}
validated={
errors.attributes && errors.attributes["x509-subjectdn"]
errors.attributes?.["x509-subjectdn"]
? ValidatedOptions.error
: ValidatedOptions.default
}
@ -32,7 +32,7 @@ export const X509 = () => {
id="kc-subject"
name="attributes.x509-subjectdn"
validated={
errors.attributes && errors.attributes["x509-subjectdn"]
errors.attributes?.["x509-subjectdn"]
? ValidatedOptions.error
: ValidatedOptions.default
}

4
src/components/attribute-form/AttributeForm.tsx
View file

@ -107,9 +107,7 @@ export const AttributesForm = ({
aria-label="key-input"
defaultValue={attribute.key}
validated={
errors.attributes && errors.attributes[rowIndex]
? "error"
: "default"
errors.attributes?.[rowIndex] ? "error" : "default"
}
/>
</Td>

5
src/components/multi-line-input/MultiLineInput.tsx
View file

@ -76,10 +76,7 @@ export const MultiLineInput = ({
onClick={() => append({})}
tabIndex={-1}
aria-label={t("common:add")}
isDisabled={
rest.isDisabled ||
!(currentValues && currentValues[index]?.value)
}
isDisabled={rest.isDisabled || !currentValues?.[index]?.value}
>
<PlusCircleIcon /> {t(addButtonLabel || "common:add")}
</Button>

7
src/components/table-toolbar/KeycloakDataTable.tsx
View file

@ -224,12 +224,7 @@ export function KeycloakDataTable<T>({
}),
},
];
if (
detailColumns &&
detailColumns[0] &&
detailColumns[0].enabled &&
detailColumns[0].enabled(value)
) {
if (detailColumns?.[0]?.enabled?.(value)) {
row.push({
parent: index * 2,
cells: detailColumns!.map((col) => {

6
src/components/table-toolbar/TableToolbar.tsx
View file

@ -49,10 +49,10 @@ export const TableToolbar: FunctionComponent<TableToolbarProps> = ({
const onSearch = () => {
if (searchValue !== "") {
setSearchValue(searchValue);
inputGroupOnEnter && inputGroupOnEnter(searchValue);
inputGroupOnEnter?.(searchValue);
} else {
setSearchValue("");
inputGroupOnEnter && inputGroupOnEnter("");
inputGroupOnEnter?.("");
}
};
@ -66,7 +66,7 @@ export const TableToolbar: FunctionComponent<TableToolbarProps> = ({
value: string,
event: FormEvent<HTMLInputElement>
) => {
inputGroupOnChange && inputGroupOnChange(value, event);
inputGroupOnChange?.(value, event);
setSearchValue(value);
};

4
src/context/whoami/WhoAmI.tsx
View file

@ -8,7 +8,7 @@ import { useAdminClient, useFetch } from "../auth/AdminClient";
export class WhoAmI {
constructor(private me?: WhoAmIRepresentation) {
if (this.me !== undefined && this.me.locale) {
if (this.me?.locale) {
i18n.changeLanguage(this.me.locale, (error) => {
if (error) console.error("Unable to set locale to", this.me?.locale);
});
@ -28,7 +28,7 @@ export class WhoAmI {
}
public canCreateRealm(): boolean {
return this.me !== undefined && this.me.createRealm;
return !!this.me?.createRealm;
}
public getRealmAccess(): Readonly<{

19
src/identity-providers/add/AdvancedSettings.tsx
View file

@ -72,16 +72,15 @@ const LoginFlow = ({
)}
</>
<>
{flows &&
flows.map((option) => (
<SelectOption
selected={option.alias === value}
key={option.id}
value={option.alias}
>
{option.alias}
</SelectOption>
))}
{flows?.map((option) => (
<SelectOption
selected={option.alias === value}
key={option.id}
value={option.alias}
>
{option.alias}
</SelectOption>
))}
</>
</Select>
)}

8
src/identity-providers/add/DiscoverySettings.tsx
View file

@ -37,7 +37,7 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
fieldId="kc-authorization-url"
isRequired
validated={
errors.config && errors.config.authorizationUrl
errors.config?.authorizationUrl
? ValidatedOptions.error
: ValidatedOptions.default
}
@ -50,7 +50,7 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
name="config.authorizationUrl"
ref={register({ required: true })}
validated={
errors.config && errors.config.authorizationUrl
errors.config?.authorizationUrl
? ValidatedOptions.error
: ValidatedOptions.default
}
@ -63,7 +63,7 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
fieldId="tokenUrl"
isRequired
validated={
errors.config && errors.config.tokenUrl
errors.config?.tokenUrl
? ValidatedOptions.error
: ValidatedOptions.default
}
@ -75,7 +75,7 @@ const Fields = ({ readOnly }: DiscoverySettingsProps) => {
name="config.tokenUrl"
ref={register({ required: true })}
validated={
errors.config && errors.config.tokenUrl
errors.config?.tokenUrl
? ValidatedOptions.error
: ValidatedOptions.default
}

14
src/identity-providers/add/OpenIdConnectSettings.tsx
View file

@ -117,8 +117,7 @@ export const OpenIdConnectSettings = () => {
/>
}
validated={
(discoveryResult && discoveryResult.error) ||
errors.discoveryEndpoint
discoveryResult?.error || errors.discoveryEndpoint
? "error"
: !discoveryResult
? "default"
@ -141,8 +140,7 @@ export const OpenIdConnectSettings = () => {
onChange={setDiscoveryUrl}
onBlur={() => setDiscovering(!discovering)}
validated={
(discoveryResult && discoveryResult.error) ||
errors.discoveryEndpoint
discoveryResult?.error || errors.discoveryEndpoint
? "error"
: !discoveryResult
? "default"
@ -168,9 +166,7 @@ export const OpenIdConnectSettings = () => {
forID="kc-import-config"
/>
}
validated={
discoveryResult && discoveryResult.error ? "error" : "default"
}
validated={discoveryResult?.error ? "error" : "default"}
helperTextInvalid={discoveryResult?.error?.toString()}
>
<JsonFileUpload
@ -178,9 +174,7 @@ export const OpenIdConnectSettings = () => {
helpText="identity=providers-help:jsonFileUpload"
hideDefaultPreview
unWrap
validated={
discoveryResult && discoveryResult.error ? "error" : "default"
}
validated={discoveryResult?.error ? "error" : "default"}
onChange={(value) => fileUpload(value)}
/>
</FormGroup>

4
src/identity-providers/component/ClientIdSecret.tsx
View file

@ -32,7 +32,7 @@ export const ClientIdSecret = ({
fieldId="kc-client-id"
isRequired
validated={
errors.config && errors.config.clientId
errors.config?.clientId
? ValidatedOptions.error
: ValidatedOptions.default
}
@ -59,7 +59,7 @@ export const ClientIdSecret = ({
fieldId="kc-client-secret"
isRequired={secretRequired}
validated={
errors.config && errors.config.clientSecret
errors.config?.clientSecret
? ValidatedOptions.error
: ValidatedOptions.default
}

4
src/realm-roles/RoleAttributes.tsx
View file

@ -77,9 +77,7 @@ export const RoleAttributes = ({
aria-label="key-input"
defaultValue={attribute.key}
validated={
errors.attributes && errors.attributes[rowIndex]
? "error"
: "default"
errors.attributes?.[rowIndex] ? "error" : "default"
}
/>
</Td>

34
src/user-federation/kerberos/KerberosSettingsRequired.tsx
View file

@ -139,13 +139,11 @@ export const KerberosSettingsRequired = ({
})}
data-testid="kerberos-realm"
/>
{form.errors.config &&
form.errors.config.kerberosRealm &&
form.errors.config.kerberosRealm[0] && (
<div className="error">
{form.errors.config.kerberosRealm[0].message}
</div>
)}
{form.errors.config?.kerberosRealm?.[0] && (
<div className="error">
{form.errors.config.kerberosRealm[0].message}
</div>
)}
</FormGroup>
<FormGroup
@ -173,13 +171,11 @@ export const KerberosSettingsRequired = ({
})}
data-testid="kerberos-principal"
/>
{form.errors.config &&
form.errors.config.serverPrincipal &&
form.errors.config.serverPrincipal[0] && (
<div className="error">
{form.errors.config.serverPrincipal[0].message}
</div>
)}
{form.errors.config?.serverPrincipal?.[0] && (
<div className="error">
{form.errors.config.serverPrincipal[0].message}
</div>
)}
</FormGroup>
<FormGroup
@ -207,13 +203,9 @@ export const KerberosSettingsRequired = ({
})}
data-testid="kerberos-keytab"
/>
{form.errors.config &&
form.errors.config.keyTab &&
form.errors.config.keyTab[0] && (
<div className="error">
{form.errors.config.keyTab[0].message}
</div>
)}
{form.errors.config?.keyTab?.[0] && (
<div className="error">{form.errors.config.keyTab[0].message}</div>
)}
</FormGroup>
<FormGroup

12
src/user-federation/ldap/LdapSettingsConnection.tsx
View file

@ -116,13 +116,11 @@ export const LdapSettingsConnection = ({
},
})}
/>
{form.errors.config &&
form.errors.config.connectionUrl &&
form.errors.config.connectionUrl[0] && (
<div className="error">
{form.errors.config.connectionUrl[0].message}
</div>
)}
{form.errors.config?.connectionUrl?.[0] && (
<div className="error">
{form.errors.config.connectionUrl[0].message}
</div>
)}
</FormGroup>
<FormGroup
label={t("enableStartTls")}

36
src/user-federation/ldap/LdapSettingsKerberosIntegration.tsx
View file

@ -93,13 +93,11 @@ export const LdapSettingsKerberosIntegration = ({
})}
data-testid="kerberos-realm"
/>
{form.errors.config &&
form.errors.config.kerberosRealm &&
form.errors.config.kerberosRealm[0] && (
<div className="error">
{form.errors.config.kerberosRealm[0].message}
</div>
)}
{form.errors.config?.kerberosRealm?.[0] && (
<div className="error">
{form.errors.config.kerberosRealm[0].message}
</div>
)}
</FormGroup>
<FormGroup
@ -127,13 +125,11 @@ export const LdapSettingsKerberosIntegration = ({
})}
data-testid="kerberos-principal"
/>
{form.errors.config &&
form.errors.config.serverPrincipal &&
form.errors.config.serverPrincipal[0] && (
<div className="error">
{form.errors.config.serverPrincipal[0].message}
</div>
)}
{form.errors.config?.serverPrincipal?.[0] && (
<div className="error">
{form.errors.config.serverPrincipal[0].message}
</div>
)}
</FormGroup>
<FormGroup
@ -161,13 +157,11 @@ export const LdapSettingsKerberosIntegration = ({
})}
data-testid="kerberos-keytab"
/>
{form.errors.config &&
form.errors.config.keyTab &&
form.errors.config.keyTab[0] && (
<div className="error">
{form.errors.config.keyTab[0].message}
</div>
)}
{form.errors.config?.keyTab?.[0] && (
<div className="error">
{form.errors.config.keyTab[0].message}
</div>
)}
</FormGroup>
<FormGroup

70
src/user-federation/ldap/LdapSettingsSearching.tsx
View file

@ -106,13 +106,9 @@ export const LdapSettingsSearching = ({
},
})}
/>
{form.errors.config &&
form.errors.config.usersDn &&
form.errors.config.usersDn[0] && (
<div className="error">
{form.errors.config.usersDn[0].message}
</div>
)}
{form.errors.config?.usersDn?.[0] && (
<div className="error">{form.errors.config.usersDn[0].message}</div>
)}
</FormGroup>
<FormGroup
label={t("usernameLdapAttribute")}
@ -140,13 +136,11 @@ export const LdapSettingsSearching = ({
},
})}
/>
{form.errors.config &&
form.errors.config.usernameLDAPAttribute &&
form.errors.config.usernameLDAPAttribute[0] && (
<div className="error">
{form.errors.config.usernameLDAPAttribute[0].message}
</div>
)}
{form.errors.config?.usernameLDAPAttribute?.[0] && (
<div className="error">
{form.errors.config.usernameLDAPAttribute[0].message}
</div>
)}
</FormGroup>
<FormGroup
label={t("rdnLdapAttribute")}
@ -174,13 +168,11 @@ export const LdapSettingsSearching = ({
},
})}
/>
{form.errors.config &&
form.errors.config.rdnLDAPAttribute &&
form.errors.config.rdnLDAPAttribute[0] && (
<div className="error">
{form.errors.config.rdnLDAPAttribute[0].message}
</div>
)}
{form.errors.config?.rdnLDAPAttribute?.[0] && (
<div className="error">
{form.errors.config.rdnLDAPAttribute[0].message}
</div>
)}
</FormGroup>
<FormGroup
label={t("uuidLdapAttribute")}
@ -208,13 +200,11 @@ export const LdapSettingsSearching = ({
},
})}
/>
{form.errors.config &&
form.errors.config.uuidLDAPAttribute &&
form.errors.config.uuidLDAPAttribute[0] && (
<div className="error">
{form.errors.config.uuidLDAPAttribute[0].message}
</div>
)}
{form.errors.config?.uuidLDAPAttribute?.[0] && (
<div className="error">
{form.errors.config.uuidLDAPAttribute[0].message}
</div>
)}
</FormGroup>
<FormGroup
label={t("userObjectClasses")}
@ -242,13 +232,11 @@ export const LdapSettingsSearching = ({
},
})}
/>
{form.errors.config &&
form.errors.config.userObjectClasses &&
form.errors.config.userObjectClasses[0] && (
<div className="error">
{form.errors.config.userObjectClasses[0].message}
</div>
)}
{form.errors.config?.userObjectClasses?.[0] && (
<div className="error">
{form.errors.config.userObjectClasses[0].message}
</div>
)}
</FormGroup>
<FormGroup
label={t("userLdapFilter")}
@ -272,13 +260,11 @@ export const LdapSettingsSearching = ({
},
})}
/>
{form.errors.config &&
form.errors.config.customUserSearchFilter &&
form.errors.config.customUserSearchFilter[0] && (
<div className="error">
{form.errors.config.customUserSearchFilter[0].message}
</div>
)}
{form.errors.config?.customUserSearchFilter?.[0] && (
<div className="error">
{form.errors.config.customUserSearchFilter[0].message}
</div>
)}
</FormGroup>
<FormGroup

2
src/user-federation/ldap/mappers/LdapMapperHardcodedLdapGroup.tsx
View file

@ -36,7 +36,7 @@ export const LdapMapperHardcodedLdapGroup = ({
name="config.group[0]"
ref={form.register({ required: true })}
validated={
form.errors.config && form.errors.config.group
form.errors.config?.group
? ValidatedOptions.error
: ValidatedOptions.default
}

2
src/user-federation/ldap/mappers/LdapMapperHardcodedLdapRole.tsx
View file

@ -78,7 +78,7 @@ export const LdapMapperHardcodedLdapRole = ({
name="config.role[0]"
ref={form.register({ required: true })}
validated={
form.errors.config && form.errors.config.role
form.errors.config?.role
? ValidatedOptions.error
: ValidatedOptions.default
}

6
src/user-federation/ldap/mappers/LdapMapperRoleGroup.tsx
View file

@ -79,10 +79,10 @@ export const LdapMapperRoleGroup = ({
ref={form.register({ required: true })}
validated={
isRole
? form.errors.config && form.errors.config["roles-dn"]
? form.errors.config?.["roles-dn"]
? ValidatedOptions.error
: ValidatedOptions.default
: form.errors.config && form.errors.config["groups-dn"]
: form.errors.config?.["groups-dn"]
? ValidatedOptions.error
: ValidatedOptions.default
}
@ -583,7 +583,7 @@ export const LdapMapperRoleGroup = ({
name="config.groups-path[0]"
ref={form.register({ required: true })}
validated={
form.errors.config && form.errors.config["groups-path"]
form.errors.config?.["groups-path"]
? ValidatedOptions.error
: ValidatedOptions.default
}

7
src/user/UserGroups.tsx
View file

@ -111,8 +111,11 @@ export const UserGroups = () => {
const arr = getAllSubgroupPaths(
rootLevelGroups,
(x: GroupRepresentation, context: GroupRepresentation[][]) => {
if (x !== undefined && x.subGroups) context.push(x.subGroups);
(
x: GroupRepresentation | undefined,
context: GroupRepresentation[][]
) => {
if (x?.subGroups) context.push(x.subGroups);
},
[]
);