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

feat: Impersonate a user (backport #25050) #25058

Open
wants to merge 7 commits into
base: version-14-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2024

This is an automatic backport of pull request #25050 done by Mergify.
Cherry-pick of ecc9ff3 has failed:

On branch mergify/bp/version-14-hotfix/pr-25050
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit ecc9ff378e.
  (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:   frappe/core/doctype/user/test_user.py
	modified:   frappe/core/doctype/user/user.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/user/user.py

Cherry-pick of c58ac80 has failed:

On branch mergify/bp/version-14-hotfix/pr-25050
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c58ac809ac.
  (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:   frappe/auth.py
	modified:   frappe/sessions.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/user/user.py

Cherry-pick of 0fd4d6b has failed:

On branch mergify/bp/version-14-hotfix/pr-25050
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0fd4d6b67f.
  (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:   frappe/core/doctype/activity_log/activity_log.json
	both modified:   frappe/core/doctype/activity_log/activity_log.py
	both modified:   frappe/core/doctype/user/user.py

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

Cherry-pick of 24499d9 has failed:

On branch mergify/bp/version-14-hotfix/pr-25050
Your branch is ahead of 'origin/version-14-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 24499d93f8.
  (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:   frappe/core/doctype/user/user.js
	modified:   frappe/sessions.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/user/user.py

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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team February 26, 2024 10:38
@mergify mergify bot added the conflicts label Feb 26, 2024
@mergify mergify bot requested review from surajshetty3416 and removed request for a team February 26, 2024 10:38
@mergify mergify bot assigned ankush Feb 26, 2024
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-25050 branch from 057ec91 to fced830 Compare February 26, 2024 10:46
@ankush ankush enabled auto-merge (squash) February 26, 2024 10:55
@ankush ankush removed the conflicts label Feb 26, 2024
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-25050 branch from 9fc743d to 3427811 Compare February 26, 2024 11:33
@ankush ankush closed this Feb 26, 2024
auto-merge was automatically disabled February 26, 2024 11:57

Pull request was closed

@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-25050 branch February 26, 2024 11:58
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 12, 2024
@ankush ankush restored the mergify/bp/version-14-hotfix/pr-25050 branch May 23, 2024 05:45
@ankush ankush reopened this May 23, 2024
@ankush ankush enabled auto-merge (squash) May 28, 2024 10:29
@akhilnarang
Copy link
Member

@Mergifyio rebase

@akhilnarang akhilnarang force-pushed the mergify/bp/version-14-hotfix/pr-25050 branch from 8b21fb3 to c7bd8ad Compare June 19, 2024 12:31
@akhilnarang akhilnarang force-pushed the mergify/bp/version-14-hotfix/pr-25050 branch 2 times, most recently from 258fceb to 3762d88 Compare June 24, 2024 08:29
- add back missing decorator
- set commit=True
- fix cache call

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
@akhilnarang akhilnarang force-pushed the mergify/bp/version-14-hotfix/pr-25050 branch from 1b2985e to 7861a2e Compare June 24, 2024 14:24
@akhilnarang
Copy link
Member

Tests are failing because some of the requests after the impersonated request seem to be using the same deleted user's SID, need to figure out why, its fine on v14/v15.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants