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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 27 commits into from
Jan 23, 2025
Merged

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

merged 27 commits into from
Jan 23, 2025

Conversation

ChiuchiuSorin
Copy link
Contributor

@ChiuchiuSorin ChiuchiuSorin commented Nov 13, 2024 •
edited
Loading

Created a custom display for administration in AzureADClientConfigurationSheet. Administration page:

Screenshot from 2024-11-13 18-08-09
Screenshot from 2024-11-13 18-08-24
Screenshot from 2024-11-13 18-09-43

@ChiuchiuSorin
Upgrade parent to 14.10 xwikisas#46
0e48b19 
* modified parent  platform version to 14.10-1
* uploaded the documents from an instance of XWiki 14.10
* updated README.md
* checked for keywords and regex
* tested functionalities using Identity OAuth (pro)
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
2d4bb40
@ChiuchiuSorin
Merge branch 'master' into iss41
26bf761 
# Conflicts:
#	pom.xml
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
31c4c26 
* Created a new configuration for OIDC properties
* Set default values specific to Azure for the new configuration
* Created a java configuration for the old configuration for the old Identity OAuth classes
* Created a listener that copies the old configuration to the newly OIDC configuration
@ChiuchiuSorin
Merge branch 'master' into iss41
cee5bdd
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
7a17fe1 


* created a new class to include additioal properties to the OIDC client class and created a new configuration soruce for it
* created AzureADClientConfigurationSheet to use as a custom display inside the administration
* modified the listener to intercept events update and delete to be able to update the OIDC endpoints in case the tenent id is modified
@ChiuchiuSorin ChiuchiuSorin self-assigned this Nov 13, 2024
@ChiuchiuSorin ChiuchiuSorin linked an issue Nov 13, 2024 that may be closed by this pull request
Create a custom display for the new configuration properties #42
Open
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
f4a6473
@ChiuchiuSorin
Merge branch 'iss41' into iss42
f86f093 
# Conflicts:
#	api/src/main/java/com/xwiki/azureoauth/configuration/AzureConfiguration.java
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
e7f0f6b
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
1d93515
@ChiuchiuSorin
Merge branch 'iss41' into iss42
d102b29
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
f68bd7a 
* created a new configuration class for OIDC
* refactored the listener
* refactored the configuration sources+
@ChiuchiuSorin
Merge remote-tracking branch 'origin/iss41' into iss42
06b14b0 
# Conflicts:
#	api/src/main/java/com/xwiki/azureoauth/internal/AzureADUpgradingListener.java
#	api/src/main/java/com/xwiki/azureoauth/internal/configuration/DefaultAzureConfiguration.java
#	ui/src/main/resources/AzureAD/AzureADClientConfiguration.xml
#	ui/src/main/resources/AzureAD/AzureADConfigurationClass.xml
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
d347de6
@ChiuchiuSorin ChiuchiuSorin marked this pull request as ready for review November 15, 2024 16:31
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
930b366 
* replaced DocumentUpdatedEvent with XObjectUpdatedEvent
* removed TODO
@ChiuchiuSorin
Merge branch 'iss41' into iss42
3c36556
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
547ba56 
* renamed AzureAD to Entra ID
* refactored the initializer
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
f5a5eb0 
* added unit tests
* code refactoring
@ChiuchiuSorin
Merge branch 'iss41' into iss42
7c675a2 
# Conflicts:
#	api/src/main/resources/META-INF/components.txt
@ChiuchiuSorin
Merge branch '2.x' into iss42
d9628be 
# Conflicts:
#	api/src/main/java/com/xwiki/azureoauth/configuration/EntraIDConfiguration.java
#	api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
#	api/src/main/java/com/xwiki/azureoauth/internal/configuration/DefaultEntraIDConfiguration.java
#	api/src/main/java/com/xwiki/azureoauth/internal/configuration/EntraIDConfigurationSource.java
#	api/src/main/java/com/xwiki/azureoauth/internal/configuration/OIDCClientConfigurationSource.java
#	api/src/main/resources/META-INF/components.txt
#	api/src/test/java/com/xwiki/azureoauth/internal/AzureADOIDCMigratorTest.java
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
1fc5b8e 


* fixed merge issues
@ChiuchiuSorin ChiuchiuSorin changed the base branch from master to 2.x December 16, 2024 14:56
@ChiuchiuSorin ChiuchiuSorin modified the milestone: 2.0 Dec 16, 2024
oanalavinia
oanalavinia requested changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@oanalavinia oanalavinia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments
The others were discussed in a meeting :)

ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
@ChiuchiuSorin
Copy link
Contributor Author

Made the group mapping field selectable:
Screenshot from 2025-01-15 18-42-35

oanalavinia
oanalavinia requested changes Jan 16, 2025
View reviewed changes
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
oanalavinia
oanalavinia approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@oanalavinia oanalavinia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml Outdated Show resolved Hide resolved
@ChiuchiuSorin ChiuchiuSorin merged commit 90399dd into xwikisas:2.x Jan 23, 2025
@ChiuchiuSorin ChiuchiuSorin deleted the iss42 branch January 23, 2025 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oanalavinia oanalavinia oanalavinia approved these changes

Assignees

@ChiuchiuSorin ChiuchiuSorin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Create a custom display for the new configuration properties
2 participants
@ChiuchiuSorin @oanalavinia