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

Replace identity-oauth use with OIDC #48 #53

Merged
merged 51 commits into from
Jan 23, 2025
Merged

Replace identity-oauth use with OIDC #48 #53

merged 51 commits into from
Jan 23, 2025

Conversation

ChiuchiuSorin
Copy link
Contributor

  • created drawer header extension points to add the option to log in with XWiki
  • modified configuration
  • created rest endpoint to access the log in with the oidc skipped option
  • created script service for Azure AD
  • removed old code

@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 iss48
a431142 
# Conflicts:
#	pom.xml
@ChiuchiuSorin
Merge branch 'iss41' into iss48
503359e
@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
Merge remote-tracking branch 'origin/iss42' into iss48
3d537ae
@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
Merge remote-tracking branch 'origin/iss42' into iss48
ac05e86
@ChiuchiuSorin
Migrate old objects values to the OIDC class xwikisas#41
1d93515
@ChiuchiuSorin
Merge branch 'iss41' into iss42
d102b29
@ChiuchiuSorin
Merge remote-tracking branch 'origin/iss42' into iss48
c68cc77
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
66a9803 
* created drawer header extension points to add the option to log in with XWiki
* modified configuration
* removed old code
* created rest enpoint to access the log in with the oidc skipped option
* created script service for Azure AD
@ChiuchiuSorin ChiuchiuSorin self-assigned this Nov 15, 2024
@ChiuchiuSorin ChiuchiuSorin linked an issue Nov 15, 2024 that may be closed by this pull request
Replace identity-oauth use with OIDC #48
Open
@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
Merge remote-tracking branch 'origin/iss42' into iss48
497ef70 
# Conflicts:
#	api/src/main/resources/META-INF/components.txt
#	ui/src/main/resources/AzureAD/AzureADConfig.xml
@ChiuchiuSorin ChiuchiuSorin marked this pull request as ready for review November 18, 2024 09:57
@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
Merge branch 'iss42' into iss48
a39d374
@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 ChiuchiuSorin changed the base branch from master to 2.x January 15, 2025 09:27
oanalavinia
oanalavinia reviewed 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 other were discussed in a meeting

api/pom.xml Outdated Show resolved Hide resolved
ui/src/main/resources/AzureAD/WebHome.xml Outdated Show resolved Hide resolved
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
0d47e8f 


* added selectable fields to group mapping
* codestyle refactoring
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
eeb6aa8 


* codestyle refactoring
@ChiuchiuSorin
Create a custom display for the new configuration properties xwikisas#42
4d1dec2 


* refactoring
@ChiuchiuSorin
Merge branch 'iss42' into iss48
c61ed9e 
# Conflicts:
#	admin-ui/src/main/resources/AzureADAdmin/Translations.xml
#	api/src/main/resources/META-INF/components.txt
#	ui/src/main/resources/AzureAD/AzureADConfig.xml
#	ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
cced3ed 
* removed AzureAdmin module
* moved translations to the UI module
* moved WebHome from AzureAD to EntraID
* codestyle refactoring
* modified Azure names to Entra
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
5e9f9f5 
* removed duplicate dependencies
* code refactoring
@ChiuchiuSorin
Copy link
Contributor Author

New drawer login options:
image
image

oanalavinia
oanalavinia reviewed Jan 16, 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.

I have a remark about the UI of the drawer buttons. I see that the already existing XWiki buttons use italic, while the new buttons do not look the same

ui/pom.xml Outdated Show resolved Hide resolved
ui/src/main/resources/EntraID/WebHome.xml Outdated Show resolved Hide resolved
oanalavinia
oanalavinia requested 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 overall. Just waiting for Stefana's input on the naming and also for changes / answer related to this comment #53 (review)
Thanks!

ui/src/main/resources/EntraID/WebHome.xml Show resolved Hide resolved
@ChiuchiuSorin
Merge branch '2.x' into iss48
aedc091 
# Conflicts:
#	admin-ui/src/main/resources/AzureADAdmin/Translations.xml
#	ui/src/main/resources/EntraID/Code/EntraOIDCClientConfigurationSheet.xml
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
142fcbe 
* fixed merge
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
83b4f52 
* codestyle
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
3923042 
* modified extension name and description
@ChiuchiuSorin
Replace identity-oauth use with OIDC xwikisas#48
0543f44 
* modified extension name and description
@ChiuchiuSorin ChiuchiuSorin merged commit cc2d162 into xwikisas:2.x Jan 23, 2025
@ChiuchiuSorin ChiuchiuSorin deleted the iss48 branch January 23, 2025 14:12
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.

Replace identity-oauth use with OIDC
2 participants
@ChiuchiuSorin @oanalavinia