xsf / xeps

Hosts the markup for all XMPP Protocol Extensions.
https://xmpp.org/extensions/
Other
125 stars 119 forks source link

Overhaul SCRAM Upgrade ProtoXEP to include definition of SASL2 upgrade tasks #1248

Closed tmolitor-stud-tu closed 1 year ago

tmolitor-stud-tu commented 1 year ago

Current rendering: https://dyn.eightysoft.de/final/xep-scram-upgrade.html#protocol

horazont commented 1 year ago

Uuuuuuh you're changing a protoxep which is being voted on in a way which causes merge conflicts.

Please provide links to list discussion which explains why.

tmolitor-stud-tu commented 1 year ago

@horazont as far as I know, voting was postponed because of it's SASL2 dependency.

The update is because Dave and MattJ wanted to move the update tasks to it's own xep. They argued that such upgrade tasks are merely a single usecase for SASL2 tasks and don't belong into SASL2 directly.

Dave said so in the pull request review on github (I've tagged you there so that you can find it). When Dave did not answer for a longer period, I discussed with @mwild1 how to proceed and he said, that he would like to split that out, too. That's why I did it the way it is now.

tmolitor-stud-tu commented 1 year ago

I did a rebase on master which should resolve all merge conflicts. I've also fixed some bugs in the examples and changed the structure for better readability.

tmolitor-stud-tu commented 1 year ago

This is related to #1214 and should be merged/voted on/published after #1214 was merged/published...

It contains stuff that was originally part of the XEP-0388 overhaul but was since split out on @dwd 's request.

Kev commented 1 year ago

This doesn't pass CI.

tmolitor-stud-tu commented 1 year ago

@Kev fixed now :)