diff options
| author | S7evinK <2353100+S7evinK@users.noreply.github.com> | 2022-02-16 18:55:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 18:55:38 +0100 |
| commit | 5a39512f5f35b13adea3afc2e366e01ec73924de (patch) | |
| tree | ac0e5cd6de8798e45cf0b5b37440ae08f4c7ba90 /appservice | |
| parent | e9b672a34e08bce9d12b2a2454c19fde6e52036e (diff) | |
Add account type (#2171)
* Add account_type for sqlite3
* Add account_type for postgres
* Remove CreateGuestAccount from interface
* Add new AccountTypes & update test
* Use newly added AccountType for account creation
* Add migrations
* Reuse type
* Add AccounnType to Device, so it can be verified on requests
* Rename migration, add missing update for appservices
* Rename sqlite3 migration
* Add missing AccountType to return value
* Update sqlite migration
Change allowance check on /admin/whois
* Fix migration, add IS NULL
* Move accountType to completeRegistration
* Fix migrations
* Add passing test
Diffstat (limited to 'appservice')
| -rw-r--r-- | appservice/appservice.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/appservice/appservice.go b/appservice/appservice.go index 7e7c67f5..b33d7b70 100644 --- a/appservice/appservice.go +++ b/appservice/appservice.go @@ -22,6 +22,8 @@ import ( "time" "github.com/gorilla/mux" + "github.com/sirupsen/logrus" + appserviceAPI "github.com/matrix-org/dendrite/appservice/api" "github.com/matrix-org/dendrite/appservice/consumers" "github.com/matrix-org/dendrite/appservice/inthttp" @@ -34,7 +36,6 @@ import ( "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/jetstream" userapi "github.com/matrix-org/dendrite/userapi/api" - "github.com/sirupsen/logrus" ) // AddInternalRoutes registers HTTP handlers for internal API calls @@ -121,7 +122,7 @@ func generateAppServiceAccount( ) error { var accRes userapi.PerformAccountCreationResponse err := userAPI.PerformAccountCreation(context.Background(), &userapi.PerformAccountCreationRequest{ - AccountType: userapi.AccountTypeUser, + AccountType: userapi.AccountTypeAppService, Localpart: as.SenderLocalpart, AppServiceID: as.ID, OnConflict: userapi.ConflictUpdate, |