Allow SSO authentication to provide a user secret

[summersab]

Implementing PR #24837 from immerda. It's a feature I'd like to have, and he hasn't been active on GitHub since December. So, I'd like to submit the PR.

[MichaIng]

Would be great if you could squash the commits to clean the history. But let's see what CI says, probably more to add.

[summersab]

Would be great if you could squash the commits to clean the history. But let's see what CI says, probably more to add.

Forgive my ignorance, but I have no idea how to do that. I did some searching, tried a few tutorials, and wasn't successful. It seems like everyone uses git a bit differently . . .

If you could tell me what commands to run, I'll gladly do it. I'm a technical user, but I'm not the most git-savvy.

[MichaIng]

This should do it, basically removing the last three commits from the log and creating a new commit with the apparent changes:

git reset --soft HEAD~3
git commit
git push -f origin HEAD

CI is happy 😃, just for the record, in case after squash some drone check fails for an obviously unrelated reason.

[LukasReschke]

Something seems to have gone wrong with the rebase.

[MichaIng]

A rebase onto the latest upstream branch was missing but changes from that present.

Dammit, I resolved it locally and wanted to push them summersab:master master, but pushed master itself instead of the local head, so that no changes were there anymore, leading to the PR being closed automatically. And now that it is closed, I have no push permissions anymore to push the local commit 😅 ... Sorry for that. I'll push it to a new branch and open a PR with that.

[MichaIng]

#27929

[MichaIng]

@summersab
Btw, for small changes on a single file I usually use the GitHub editor as well. But if other changes need to be done or fixes, to avoid multiple commits, I do it like that on a local clone:

git add . # add newly done local changes
git commit --amend --no-edit # amend to existing commit (skip --no-edit if you want to change commit text)
git remote add upstream https://github.com/nextcloud/server.git # if not yet done
git fetch upstream
git rebase upstream/master # rebase the commit onto latest upstream master branch, in case it got changes in the meantime
git push -f origin HEAD

And when squashing commits like posted above, always good to assure that the intended commits are included:

git log