Skip to content

[stable32] fix: Reduce the mixups between apptokens and session ids#59774

Merged
artonge merged 1 commit intostable32from
backport/59758/stable32
Apr 21, 2026
Merged

[stable32] fix: Reduce the mixups between apptokens and session ids#59774
artonge merged 1 commit intostable32from
backport/59758/stable32

Conversation

@backportbot
Copy link
Copy Markdown

@backportbot backportbot Bot commented Apr 21, 2026

Backport of #59758

@backportbot backportbot Bot added the 3. to review Waiting for reviews label Apr 21, 2026
@backportbot backportbot Bot added this to the Nextcloud 32.0.9 milestone Apr 21, 2026
@come-nc come-nc force-pushed the backport/59758/stable32 branch from 7e300db to fbff367 Compare April 21, 2026 09:22
@come-nc come-nc marked this pull request as ready for review April 21, 2026 09:23
@come-nc come-nc requested a review from a team as a code owner April 21, 2026 09:23
@come-nc come-nc requested review from artonge and removed request for a team April 21, 2026 09:23
@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented Apr 21, 2026

I’ve added getTokenFromPassword as in stable33 but I did not remove isTokenPassword as it’s a public function, just in case it’s used somewhere in a weird app.

@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented Apr 21, 2026

/backport to stable31

@come-nc

This comment was marked as resolved.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the backport/59758/stable32 branch from fbff367 to 310b488 Compare April 21, 2026 11:15
@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented Apr 21, 2026

/backport! to stable31

@artonge artonge merged commit 1a18fe5 into stable32 Apr 21, 2026
218 of 229 checks passed
@artonge artonge deleted the backport/59758/stable32 branch April 21, 2026 14:00
@backportbot
Copy link
Copy Markdown
Author

backportbot Bot commented Apr 21, 2026

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31

# Create the new backport branch
git checkout -b backport/59774/stable31

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 310b488a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/59774/stable31

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/59774/stable31."} - https://docs.github.com/rest/pulls/pulls#create-a-pull-request


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants