felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 01:52:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pass openIdToken to the JWT builder

Browse Source
This commit is contained in:
ismailgulek
2021-05-24 13:23:40 +03:00
parent 7ab6c398a9
commit 49132f9128
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Integrations/Widgets/Jitsi/JitsiJWTTokenBuilder.swift
+4 -2
View File
@@ -30,13 +30,15 @@ final class JitsiJWTTokenBuilder {
// MARK: - Public
func build(jitsiServerDomain: String,
openIdAccessToken: String,
openIdToken: MXOpenIdToken,
roomId: String,
userAvatarUrl: String,
userDisplayName: String) throws -> String {
// Create Jitsi JWT
let jitsiJWTPayloadContextMatrix = JitsiJWTPayloadContextMatrix(token: openIdAccessToken, roomId: roomId)
let jitsiJWTPayloadContextMatrix = JitsiJWTPayloadContextMatrix(token: openIdToken.accessToken,
roomId: roomId,
serverName: openIdToken.matrixServerName)
let jitsiJWTPayloadContextUser = JitsiJWTPayloadContextUser(avatar: userAvatarUrl, name: userDisplayName)
let jitsiJWTPayloadContext = JitsiJWTPayloadContext(matrix: jitsiJWTPayloadContextMatrix, user: jitsiJWTPayloadContextUser)
Riot/Modules/Integrations/Widgets/Jitsi/JitsiService.swift
+2 -2
View File
@@ -190,14 +190,14 @@ final class JitsiService: NSObject {
let avatarStringURL: String = myUser.avatarUrl ?? ""
return matrixSession.matrixRestClient.openIdToken({ (openIdToken) in
guard let openIdToken = openIdToken, let openIdAccessToken = openIdToken.accessToken else {
guard let openIdToken = openIdToken, openIdToken.accessToken != nil else {
failure(JitsiServiceError.unknown)
return
}
do {
let jwtToken = try self.jwtTokenBuilder.build(jitsiServerDomain: jitsiServerDomain,
openIdAccessToken: openIdAccessToken,
openIdToken: openIdToken,
roomId: roomId,
userAvatarUrl: avatarStringURL,
userDisplayName: userDisplayName)