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.2.x] AM-2887 MFA logs 2 #4000

Closed
wants to merge 1 commit into from
Closed

[4.2.x] AM-2887 MFA logs 2 #4000

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 6, 2024

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


15:01:36.652 [Thread-28] [] DEBUG i.g.a.g.h.r.r.e.m.MFAEnrollEndpoint - Factor 298f0de1-be4c-4c06-8f0d-e1be4c5c064a selected for user c11e7f61-ad3d-47c2-9e7f-61ad3d67c226

15:01:36.665 [RxCachedThreadScheduler-1] [] DEBUG i.g.a.g.h.r.r.e.m.MFAChallengeEndpoint - Challenge sent to user c11e7f61-ad3d-47c2-9e7f-61ad3d67c226

15:02:15.184 [Thread-21] [] DEBUG i.g.a.g.h.r.r.e.m.MFAChallengeEndpoint - User c11e7f61-ad3d-47c2-9e7f-61ad3d67c226 strongly authenticated

15:02:15.187 [Thread-15] [] DEBUG i.g.am.service.impl.UserServiceImpl - Factor 298f0de1-be4c-4c06-8f0d-e1be4c5c064a upserted for user c11e7f61-ad3d-47c2-9e7f-61ad3d67c226


Cherry-pick of 376491f has failed:

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

You are currently cherry-picking commit 376491f404.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-core/src/main/java/io/gravitee/am/gateway/handler/root/resources/endpoint/mfa/MFAChallengeEndpoint.java

no changes added to commit (use "git add" and/or "git commit -a")

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

fixes AM-2887

(cherry picked from commit 376491f)

# Conflicts:
#	gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-core/src/main/java/io/gravitee/am/gateway/handler/root/resources/endpoint/mfa/MFAChallengeEndpoint.java
@mergify mergify bot requested a review from a team as a code owner May 6, 2024 08:02
@mergify mergify bot added the conflicts label May 6, 2024
Copy link
Contributor Author

mergify bot commented May 6, 2024

Cherry-pick of 376491f has failed:

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

You are currently cherry-picking commit 376491f404.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-core/src/main/java/io/gravitee/am/gateway/handler/root/resources/endpoint/mfa/MFAChallengeEndpoint.java

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot deleted the mergify/bp/4.2.x/pr-3996 branch May 6, 2024 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant