Migrate old objects values to the OIDC class #41 #50
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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)
# Conflicts: # pom.xml
* 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
* created a new configuration class for OIDC * refactored the listener * refactored the configuration sources+
ChiuchiuSorin
requested review from
oanalavinia
and removed request for
oanalavinia
* replaced DocumentUpdatedEvent with XObjectUpdatedEvent * removed TODO
oanalavinia
requested changes
Nov 20, 2024
api/src/main/java/com/xwiki/azureoauth/configuration/AzureConfiguration.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/configuration/AzureOldConfiguration.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADObjectUpgradeListener.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/configuration/AzureConfiguration.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADInitializer.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADInitializer.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADObjectUpgradeListener.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADObjectUpgradeListener.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADInitializer.java
Outdated
Show resolved
Hide resolved
* renamed AzureAD to Entra ID * refactored the initializer
* added unit tests * code refactoring
oanalavinia
requested changes
Dec 2, 2024
api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
Show resolved
Hide resolved
| <hidden>true</hidden> | ||
| <content/> | ||
| <object> | ||
| <name>AzureAD.AzureADClientConfiguration</name> |
There was a problem hiding this comment.
This should also use EntraID
Even for the space. I know there is already a AzureAD space, but are any of the pages we have in it, gonna be used in 2.x, after all changes are done? Do we want to keep it for the WebPreferences, is it necessary? I feel like we will keep this space only for migration purposes and it's ok to have all new pages in a separated space (AzureAD is about old stuff / 1.x, EntraID is about 2.x). Let me know if I am missing something
There was a problem hiding this comment.
Should I also modify the naming convention of the java source folders from com.xwiki.azureoauth to com.xwiki.entraid?
There was a problem hiding this comment.
Since all (2) classes from the current package will be removed, yes, you can rename it too
There was a problem hiding this comment.
Alright, but I'd leave the renaming for after I actually remove the classes, in #48.
api/src/main/java/com/xwiki/azureoauth/internal/AzureADObjectUpdateListener.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADInitializer.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADInitializer.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADObjectUpgradeListener.java
Outdated
Show resolved
Hide resolved
* renamed new documents and classes to Entra ID name convention * replaced the configuration initialization from only at version 2.0 to whenever the configuration is empty
oanalavinia
requested changes
Dec 6, 2024
api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
Outdated
Show resolved
Hide resolved
| <hidden>true</hidden> | ||
| <content/> | ||
| <object> | ||
| <name>AzureAD.AzureADClientConfiguration</name> |
There was a problem hiding this comment.
Since all (2) classes from the current package will be removed, yes, you can rename it too
api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
Outdated
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/configuration/DefaultEntraIDConfiguration.java
Show resolved
Hide resolved
api/src/main/java/com/xwiki/azureoauth/internal/AzureADOIDCMigrator.java
Outdated
Show resolved
Hide resolved
ui/src/main/resources/EntraID/Code/EntraOIDCClientConfiguration.xml
Outdated
Show resolved
Hide resolved
Comment on lines
+751
to
+754
| <userNameFormatter>${oidc.idtoken.upn._clean._lowerCase}</userNameFormatter> | ||
| </property> | ||
| <property> | ||
| <userSubjectFormatter>${oidc.idtoken.oid}</userSubjectFormatter> |
There was a problem hiding this comment.
This is a note for later, we should mention these in the documentation after 2.0 is released :)
api/src/main/java/com/xwiki/azureoauth/internal/AzureADInitializer.java
Outdated
Show resolved
Hide resolved
* name refactoring * added and modified comments
oanalavinia
approved these changes
Dec 11, 2024
|
Don't forget to merge it in a |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 and a listener that copies the old configuration to the new OIDC configuration.