Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a custom display for the new configuration properties #42 #52

Merged
merged 27 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0e48b19
Upgrade parent to 14.10 #46
ChiuchiuSorin Oct 18, 2024
2d4bb40
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Oct 28, 2024
26bf761
Merge branch 'master' into iss41
ChiuchiuSorin Oct 31, 2024
31c4c26
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Oct 31, 2024
cee5bdd
Merge branch 'master' into iss41
ChiuchiuSorin Nov 7, 2024
7a17fe1
Create a custom display for the new configuration properties #42
ChiuchiuSorin Nov 13, 2024
f4a6473
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Nov 14, 2024
f86f093
Merge branch 'iss41' into iss42
ChiuchiuSorin Nov 14, 2024
e7f0f6b
Create a custom display for the new configuration properties #42
ChiuchiuSorin Nov 14, 2024
1d93515
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Nov 14, 2024
d102b29
Merge branch 'iss41' into iss42
ChiuchiuSorin Nov 14, 2024
f68bd7a
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Nov 15, 2024
06b14b0
Merge remote-tracking branch 'origin/iss41' into iss42
ChiuchiuSorin Nov 15, 2024
d347de6
Create a custom display for the new configuration properties #42
ChiuchiuSorin Nov 15, 2024
930b366
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Nov 20, 2024
3c36556
Merge branch 'iss41' into iss42
ChiuchiuSorin Nov 20, 2024
547ba56
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Nov 22, 2024
f5a5eb0
Migrate old objects values to the OIDC class #41
ChiuchiuSorin Nov 27, 2024
7c675a2
Merge branch 'iss41' into iss42
ChiuchiuSorin Nov 27, 2024
d9628be
Merge branch '2.x' into iss42
ChiuchiuSorin Dec 16, 2024
1fc5b8e
Create a custom display for the new configuration properties #42
ChiuchiuSorin Dec 16, 2024
8b7adda
Create a custom display for the new configuration properties #42
ChiuchiuSorin Dec 16, 2024
0d47e8f
Create a custom display for the new configuration properties #42
ChiuchiuSorin Jan 15, 2025
eeb6aa8
Create a custom display for the new configuration properties #42
ChiuchiuSorin Jan 15, 2025
4d1dec2
Create a custom display for the new configuration properties #42
ChiuchiuSorin Jan 15, 2025
62bc096
Create a custom display for the new configuration properties #42
ChiuchiuSorin Jan 23, 2025
2e169f4
Create a custom display for the new configuration properties #42
ChiuchiuSorin Jan 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion admin-ui/src/main/resources/AzureADAdmin/Translations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,48 @@ azureADAdmin.AzureADConfigClass_nowWhat2=Should you have technical difficulties,

## a single change for avatar's setting
azureADAdmin.AzureADConfigClass_scope_avatar.onlyOutlook = only works with Outlook-enabled-accounts, a {0} limitation
azureADAdmin.AzureADConfigClass_scope_avatar.onlyOutlook.linkLabel=known</content>
azureADAdmin.AzureADConfigClass_scope_avatar.onlyOutlook.linkLabel=known

## New configuration
XWiki.OIDC.ClientConfigurationClass_enableUser=Enable user profiles on first login
XWiki.OIDC.ClientConfigurationClass_skipped=Disable Azure authentication
XWiki.OIDC.ClientConfigurationClass_userInfoSkip=Use user info endpoint
XWiki.OIDC.ClientConfigurationClass_scope=Scope
XWiki.OIDC.ClientConfigurationClass_groupsClaim=Groups claim
XWiki.OIDC.ClientConfigurationClass_groupsMapping=Groups mapping
XWiki.OIDC.ClientConfigurationClass_allowedGroups=Allowed groups
XWiki.OIDC.ClientConfigurationClass_forbiddenGroups=Forbidden groups
XWiki.OIDC.ClientConfigurationClass_userNameFormatter=User name format
XWiki.OIDC.ClientConfigurationClass_userMapping=User mapping
XWiki.OIDC.ClientConfigurationClass_clientSecret=Secret
XWiki.OIDC.ClientConfigurationClass_clientId=Client ID
EntraID.Code.EntraIDConfigurationClass_tenantId=Tenant ID
EntraID.Code.EntraIDConfigurationClass_enableXWikiLoginGlobal=Allow XWiki Login
EntraID.Code.EntraIDConfigurationClass_xwikiLoginGroups=XWiki login user groups

XWiki.OIDC.ClientConfigurationClass_enableUser.hint=Define if user accounts should be enabled (marked as active) on first login.
XWiki.OIDC.ClientConfigurationClass_skipped.hint=Disable the Azure AD authentication.
XWiki.OIDC.ClientConfigurationClass_userInfoSkip.hint=Some providers have a bad implementation of the userinfo endpoint, making it unusable.
XWiki.OIDC.ClientConfigurationClass_scope.hint=The scopes to use when redirecting to the provider.
XWiki.OIDC.ClientConfigurationClass_groupsClaim.hint=Indicate the field containing the list of groups (in case it's not an OpenID Connect standard).
XWiki.OIDC.ClientConfigurationClass_groupsMapping.hint=Associates the XWiki groups with Azure AD groups.
XWiki.OIDC.ClientConfigurationClass_allowedGroups.hint=The groups the user need to belong to be allowed to authenticate.
XWiki.OIDC.ClientConfigurationClass_forbiddenGroups.hint=The groups that if a user belongs to, it will not be allowed to authenticate.
XWiki.OIDC.ClientConfigurationClass_userNameFormatter.hint=The pattern to use to generate the unique identifier of the user.
XWiki.OIDC.ClientConfigurationClass_userMapping.hint=Associate non-standard properties coming from the OpenID Connect provider with the XWiki user.
XWiki.OIDC.ClientConfigurationClass_clientSecret.hint=The client secret registered on the provider.
XWiki.OIDC.ClientConfigurationClass_clientId.hint=The client identifier used by the authentication.
EntraID.Code.EntraIDConfigurationClass_tenantId.hint=Azure AD instance ID.
EntraID.Code.EntraIDConfigurationClass_enableXWikiLoginGlobal.hint=Allow a guest user to login using the standard XWiki authenticator.
EntraID.Code.EntraIDConfigurationClass_xwikiLoginGroups.hint=User groups allowed to log in with XWiki.

entra.properties.data.newEntry=New entry
entra.properties.data.tip.key.groupMap=XWiki group...
entra.properties.data.tip.value.groupMap=Group object ID...
entra.properties.data.tip.key.userMap=XWiki user property...
entra.properties.data.tip.value.userMap=Provider property...
entra.properties.data.tip.value.forbiddenGroup=Forbidden groups...
entra.properties.data.tip.value.allowedGroup=Allowed groups...</content>
<object>
<name>AzureADAdmin.Translations</name>
<number>0</number>
Expand Down
Loading