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

[4.6.x] fix: access public APIs listed in a category when user is logged out #10643

Merged
merged 2 commits into from
Feb 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025

This is an automatic copy of pull request #10636 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-8384

Description

Allow access to public APIs listed in a category when user logged out.

Additional context

This is the second PR raised to fix the same bug because of following reasons:

  1. First one failed to pass some tests on earlier versions i.e. 4.4.x, 4.5.x. It passed the checks on 4.6.x and master.
  2. After the discussion, it came to light that the GetCategoryApisUseCase already handled the scenario to display public APIs in a category when the user id is null. We were just not passing the null id as the input to the use case.

📚  View the storybook of this branch here


Cherry-pick of e9e04a9 has failed:

On branch mergify/bp/4.6.x/pr-10636
Your branch is up to date with 'origin/4.6.x'.

You are currently cherry-picking commit e9e04a9e9a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/category/use_case/GetCategoryApisUseCase.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/category/use_case/GetCategoryApisUseCaseTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-e2e/api-test/src/portal/mapi-v1/portal-api-view-and-search.spec.ts
	both modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-debug/src/test/java/io/gravitee/gateway/reactive/debug/DebugReactorEventListenerTest.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/main/java/io/gravitee/rest/api/portal/rest/resource/ApisResource.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/test/java/io/gravitee/rest/api/portal/rest/resource/ApisResourceNotAuthenticatedTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


📚  View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner February 12, 2025 17:02
@mergify mergify bot added the conflicts label Feb 12, 2025
Copy link
Contributor Author

mergify bot commented Feb 12, 2025

Cherry-pick of e9e04a9 has failed:

On branch mergify/bp/4.6.x/pr-10636
Your branch is up to date with 'origin/4.6.x'.

You are currently cherry-picking commit e9e04a9e9a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/category/use_case/GetCategoryApisUseCase.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/category/use_case/GetCategoryApisUseCaseTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-e2e/api-test/src/portal/mapi-v1/portal-api-view-and-search.spec.ts
	both modified:   gravitee-apim-gateway/gravitee-apim-gateway-services/gravitee-apim-gateway-services-debug/src/test/java/io/gravitee/gateway/reactive/debug/DebugReactorEventListenerTest.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/main/java/io/gravitee/rest/api/portal/rest/resource/ApisResource.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/test/java/io/gravitee/rest/api/portal/rest/resource/ApisResourceNotAuthenticatedTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Okhelifi Okhelifi force-pushed the mergify/bp/4.6.x/pr-10636 branch from 418b68f to f563188 Compare February 12, 2025 17:07
Copy link

cypress bot commented Feb 12, 2025

APIM UI Tests    Run #3722

Run Properties:  status check failed Failed #3722  •  git commit f5631888df: fix: Access public APIs listed in a category when user is logged out
Project APIM UI Tests
Branch Review mergify/bp/4.6.x/pr-10636
Run status status check failed Failed #3722
Run duration 07m 07s
Commit git commit f5631888df: fix: Access public APIs listed in a category when user is logged out
Committer Aditya Goyal
View all properties for this run ↗︎

Test results
Tests that failed  Failures 2
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 8
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 80
View all changes introduced in this branch ↗︎

Tests for review

Failed  ui-test/integration/apim/ui/organization-settings/ui-users.spec.ts • 2 failed tests

View Output Video

Test Artifacts
Users > should create a new user Test Replay Screenshots Video
Users > should create a new service account user Test Replay Screenshots Video

@Okhelifi Okhelifi merged commit aa00b62 into 4.6.x Feb 12, 2025
48 of 52 checks passed
@Okhelifi Okhelifi deleted the mergify/bp/4.6.x/pr-10636 branch February 12, 2025 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants