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

Fix issue in DCR Additional attribute filter not working as OSGI #2689

Merged
merged 3 commits into from
Jan 26, 2025

Conversation

Ashi1993
Copy link
Contributor

@Ashi1993 Ashi1993 commented Jan 24, 2025

Proposed changes in this pull request

This PR fix issue in DCR Additional attribute filter added via [1] not working as OSGI

Related issue : wso2/product-is#22404

[1] #2506

When should this PR be merged

[Please describe any preconditions that need to be addressed before we
can merge this pull request.]

Follow up actions

[List any possible follow-up actions here; for instance, testing data
migrations, software that we need to install on staging and production
environments.]

Checklist (for reviewing)

General

  • Is this PR explained thoroughly? All code changes must be accounted for in the PR description.
  • Is the PR labeled correctly?

Functionality

  • Are all requirements met? Compare implemented functionality with the requirements specification.
  • Does the UI work as expected? There should be no Javascript errors in the console; all resources should load. There should be no unexpected errors. Deliberately try to break the feature to find out if there are corner cases that are not handled.

Code

  • Do you fully understand the introduced changes to the code? If not ask for clarification, it might uncover ways to solve a problem in a more elegant and efficient way.
  • Does the PR introduce any inefficient database requests? Use the debug server to check for duplicate requests.
  • Are all necessary strings marked for translation? All strings that are exposed to users via the UI must be marked for translation.

Tests

  • Are there sufficient test cases? Ensure that all components are tested individually; models, forms, and serializers should be tested in isolation even if a test for a view covers these components.
  • If this is a bug fix, are tests for the issue in place? There must be a test case for the bug to ensure the issue won’t regress. Make sure that the tests break without the new code to fix the issue.
  • If this is a new feature or a significant change to an existing feature? has the manual testing spreadsheet been updated with instructions for manual testing?

Security

  • Confirm this PR doesn't commit any keys, passwords, tokens, usernames, or other secrets.
  • Are all UI and API inputs run through forms or serializers?
  • Are all external inputs validated and sanitized appropriately?
  • Does all branching logic have a default case?
  • Does this solution handle outliers and edge cases gracefully?
  • Are all external communications secured and restricted to SSL?

Documentation

  • Are changes to the UI documented in the platform docs? If this PR introduces new platform site functionality or changes existing ones, the changes should be documented.
  • Are changes to the API documented in the API docs? If this PR introduces new API functionality or changes existing ones, the changes must be documented.
  • Are reusable components documented? If this PR introduces components that are relevant to other developers (for instance a mixin for a view or a generic form) they should be documented in the Wiki.

Copy link

codecov bot commented Jan 24, 2025

Codecov Report

Attention: Patch coverage is 50.00000% with 7 lines in your changes missing coverage. Please review.

Project coverage is 55.08%. Comparing base (12d8f1c) to head (581e6f2).
Report is 33 commits behind head on master.

Files with missing lines Patch % Lines
...entity/oauth/dcr/internal/DCRServiceComponent.java 0.00% 4 Missing ⚠️
...carbon/identity/oauth/dcr/service/DCRMService.java 50.00% 0 Missing and 3 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##             master    #2689      +/-   ##
============================================
- Coverage     55.65%   55.08%   -0.57%     
- Complexity     8524     8584      +60     
============================================
  Files           645      645              
  Lines         49283    50212     +929     
  Branches       9535    10070     +535     
============================================
+ Hits          27429    27661     +232     
- Misses        17960    18550     +590     
- Partials       3894     4001     +107     
Flag Coverage Δ
unit 39.55% <50.00%> (-0.09%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Thumimku
Thumimku previously approved these changes Jan 24, 2025
@jenkins-is-staging
Copy link

PR builder started
Link: https://github.com/wso2/product-is/actions/runs/12945661132

@@ -120,18 +117,8 @@ public Application getApplication(String clientId) throws DCRMException {
Application application = buildResponse(consumerAppDTO, tenantDomain);
application.setExtAllowedAudience(serviceProvider.getAssociatedRolesConfig().getAllowedAudience());

String attributeFilterName = IdentityUtil.getProperty(OAuthConstants.ADDITIONAL_ATTRIBUTE_FILTER);
Copy link
Contributor

@nilasini nilasini Jan 24, 2025

Choose a reason for hiding this comment

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

why are we removing the identity.xml file reading? Isn't there any case where customers have the customization which is not an OSGI service? In that case how can they register it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Even though the config is there, it is not working in the latest update levels as well. Hence, it won't be working for customers as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

Was this working in the default 7.0.0 pack? Don't we need to do the fix in a way that should work with non-osgi and osgi?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was added as a patch for IS 7.0. And was not working when the extension was from another bundle. Hence I dont think there is an issue

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok does that meant this has never worked before? Even when it was added initially?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes thats correct. But if the extension is in the same module it works.

@Thumimku Thumimku dismissed their stale review January 24, 2025 08:40

please mention what happen if the customer already has this config without osgi lib

@jenkins-is-staging
Copy link

PR builder completed
Link: https://github.com/wso2/product-is/actions/runs/12945661132
Status: failure

@jenkins-is-staging
Copy link

PR builder started
Link: https://github.com/wso2/product-is/actions/runs/12966837826

@jenkins-is-staging
Copy link

PR builder completed
Link: https://github.com/wso2/product-is/actions/runs/12966837826
Status: success

Copy link

@jenkins-is-staging jenkins-is-staging left a comment

Choose a reason for hiding this comment

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

Approving the pull request based on the successful pr build https://github.com/wso2/product-is/actions/runs/12966837826

@Ashi1993
Copy link
Contributor Author

Even though the config is there, it is not working in the latest update levels as well. Hence it won't be working for customers as well. SO removing the config won't be an issue.

@nilasini nilasini merged commit e21042f into wso2-extensions:master Jan 26, 2025
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants