External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-23 23:41:23 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixes #6556 Expose SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL (#13641)

Browse Source 
Signed-off-by: Klaas Demter <Klaas-@users.noreply.github.com>
This commit is contained in:
Klaas Demter 2023-03-27 16:30:40 +02:00 committed by GitHub
parent bf98f62654
commit 32a5186eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/sso/conf.py
View File

@ -148,6 +148,16 @@ register(
placeholder=['username', 'email'],
)
register(
'SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL',
field_class=fields.BooleanField,
default=False,
label=_('Use Email address for usernames'),
help_text=_('Enabling this setting will tell social auth to use the full Email as username instead of the full name'),
category=_('Authentication'),
category_slug='authentication',
)
###############################################################################
# LDAP AUTHENTICATION SETTINGS
###############################################################################

2
awx/ui/src/screens/Setting/MiscAuthentication/MiscAuthenticationDetail/MiscAuthenticationDetail.test.js
View File

@ -40,6 +40,7 @@ describe('<MiscAuthenticationDetail />', () => {
SOCIAL_AUTH_ORGANIZATION_MAP: {},
SOCIAL_AUTH_TEAM_MAP: {},
SOCIAL_AUTH_USER_FIELDS: [],
SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL: false,
},
});
await act(async () => {
@ -79,6 +80,7 @@ describe('<MiscAuthenticationDetail />', () => {
assertVariableDetail(wrapper, 'Social Auth Organization Map', '{}');
assertVariableDetail(wrapper, 'Social Auth Team Map', '{}');
assertVariableDetail(wrapper, 'Social Auth User Fields', '[]');
assertDetail(wrapper, 'Use Email address for usernames', 'Off');
assertDetail(
wrapper,
'Allow External Users to Create OAuth2 Tokens',

7
awx/ui/src/screens/Setting/MiscAuthentication/MiscAuthenticationEdit/MiscAuthenticationEdit.js
View File

@ -53,7 +53,8 @@ function MiscAuthenticationEdit() {
'SESSION_COOKIE_AGE',
'SOCIAL_AUTH_ORGANIZATION_MAP',
'SOCIAL_AUTH_TEAM_MAP',
'SOCIAL_AUTH_USER_FIELDS'
'SOCIAL_AUTH_USER_FIELDS',
'SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL'
);
const authenticationData = {
@ -242,6 +243,10 @@ function MiscAuthenticationEdit() {
name="SOCIAL_AUTH_USER_FIELDS"
config={authentication.SOCIAL_AUTH_USER_FIELDS}
/>
<BooleanField
name="SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL"
config={authentication.SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL}
/>
{submitError && <FormSubmitError error={submitError} />}
{revertError && <FormSubmitError error={revertError} />}
</FormColumnLayout>

1
awx/ui/src/screens/Setting/MiscAuthentication/MiscAuthenticationEdit/MiscAuthenticationEdit.test.js
View File

@ -32,6 +32,7 @@ const authenticationData = {
SOCIAL_AUTH_ORGANIZATION_MAP: null,
SOCIAL_AUTH_TEAM_MAP: null,
SOCIAL_AUTH_USER_FIELDS: null,
SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL: false,
};
describe('<MiscAuthenticationEdit />', () => {

17
awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
View File

@ -859,6 +859,15 @@
"read_only": false
}
},
"SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL": {
"type": "boolean",
"required": false,
"label": "Use Email address for usernames",
"help_text": "Enabling this setting will tell social auth to use the full Email as username instead of the full name",
"category": "Authentication",
"category_slug": "authentication",
"default": false
},
"SOCIAL_AUTH_OIDC_KEY": {
"type": "string",
"label": "OIDC Key",
@ -4554,6 +4563,14 @@
"type": "string"
}
},
"SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL": {
"type": "boolean",
"label": "Use Email address for usernames",
"help_text": "Enabling this setting will tell social auth to use the full Email as username instead of the full name",
"category": "Authentication",
"category_slug": "authentication",
"default": false
},
"SOCIAL_AUTH_OIDC_KEY": {
"type": "string",
"label": "OIDC Key",

1
awx/ui/src/screens/Setting/shared/data.allSettings.json
View File

@ -103,6 +103,7 @@
"SOCIAL_AUTH_ORGANIZATION_MAP":null,
"SOCIAL_AUTH_TEAM_MAP":null,
"SOCIAL_AUTH_USER_FIELDS":null,
"SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL":false,
"AUTH_LDAP_SERVER_URI":"ldap://ldap.example.com",
"AUTH_LDAP_BIND_DN":"cn=eng_user1",
"AUTH_LDAP_BIND_PASSWORD":"$encrypted$",