mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-13 12:52:24 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mas: move org.matrix.cross_signing_reset const from logintypes.go to key_crosssigning.go

Browse source
This commit is contained in:
Roman Isaev 2025-01-10 00:51:29 +00:00
parent 80ee52e092
commit 930daa1090
No known key found for this signature in database
GPG key ID: 7BE2B6A6C89AEC7F
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
clientapi/auth/authtypes/logintypes.go
View file

@ -11,5 +11,4 @@ const (
LoginTypeRecaptcha = "m.login.recaptcha"
LoginTypeApplicationService = "m.login.application_service"
LoginTypeToken = "m.login.token"
LoginTypeCrossSigningReset = "org.matrix.cross_signing_reset"
)

10
clientapi/routing/key_crosssigning.go
View file

@ -22,6 +22,8 @@ import (
"github.com/matrix-org/util"
)
const CrossSigningResetStage = "org.matrix.cross_signing_reset"
type crossSigningRequest struct {
api.PerformUploadDeviceKeysRequest
Auth newPasswordAuth `json:"auth"`
@ -101,7 +103,7 @@ func UploadCrossSigningDeviceKeys(
if !masterKeyUpdatableWithoutUIA {
url := ""
if m := cfg.MSCs.MSC3861; m.AccountManagementURL != "" {
url = strings.Join([]string{m.AccountManagementURL, "?action=", authtypes.LoginTypeCrossSigningReset}, "")
url = strings.Join([]string{m.AccountManagementURL, "?action=", CrossSigningResetStage}, "")
} else {
url = m.Issuer
}
@ -111,11 +113,11 @@ func UploadCrossSigningDeviceKeys(
"dummy",
[]authtypes.Flow{
{
Stages: []authtypes.LoginType{authtypes.LoginTypeCrossSigningReset},
Stages: []authtypes.LoginType{CrossSigningResetStage},
},
},
map[string]interface{}{
authtypes.LoginTypeCrossSigningReset: map[string]string{
CrossSigningResetStage: map[string]string{
"url": url,
},
},
@ -128,7 +130,7 @@ func UploadCrossSigningDeviceKeys(
}
}
// XXX: is it necessary?
sessions.addCompletedSessionStage(sessionID, authtypes.LoginTypeCrossSigningReset)
sessions.addCompletedSessionStage(sessionID, CrossSigningResetStage)
} else {
if uploadReq.Auth.Type != authtypes.LoginTypePassword {
return util.JSONResponse{