Merge pull request #1680 from vector-im/feature/fix_create_room

Fix regression: not able to create a room without IS configured (Fixes #1679)
This commit is contained in:
Benoit Marty 2020-07-13 11:30:47 +02:00 committed by GitHub
commit 4de1759321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@ Improvements 🙌:
-
Bugfix 🐛:
-
- Fix regression: not able to create a room without IS configured (#1679)
Translations 🗣:
-

View File

@ -46,7 +46,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
suspend fun build(params: CreateRoomParams): CreateRoomBody {
val invite3pids = params.invite3pids
.takeIf { it.isNotEmpty() }
.let {
?.let { invites ->
// This can throw Exception if Identity server is not configured
ensureIdentityTokenTask.execute(Unit)
@ -54,7 +54,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
?: throw IdentityServiceError.NoIdentityServerConfigured
val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured
params.invite3pids.map {
invites.map {
ThreePidInviteBody(
id_server = identityServerUrlWithoutProtocol,
id_access_token = identityServerAccessToken,