Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Task] add a aad token for getting the acs token in joining a call #380

Merged
merged 4 commits into from
Oct 13, 2022
Merged

[Task] add a aad token for getting the acs token in joining a call #380

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f20f17
add a aad token for getting the acs token in joining a call
Oct 4, 2022
ffec678
Merge branch 'develop' into task/e2eAADToken
kevinyulu Oct 5, 2022
3c6d427
Merge branch 'develop' into task/e2eAADToken
kevinyulu Oct 12, 2022
1688772
[Task] Updated UI test to accommodate use of aad token joining a call…
kevinyulu Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion AzureCommunicationUI/AzureCommunicationUIDemoApp/Sources/AuthenticationHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ import Foundation
import AzureCommunicationCommon

class AuthenticationHelper {
static func getCommunicationToken(tokenUrl: URL) -> TokenRefresher {
static func getCommunicationToken(tokenUrl: URL, aadToken: String? = nil) -> TokenRefresher {
return { completionHandler in
struct TokenResponse: Decodable {
let token: String
}
var urlRequest = URLRequest(url: tokenUrl, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 10)
urlRequest.httpMethod = "GET"
if let aadToken = aadToken {
let value = "Bearer \(aadToken)"
kevinyulu marked this conversation as resolved.
Show resolved Hide resolved
urlRequest.setValue(value, forHTTPHeaderField: "Authorization")
}
URLSession.shared.dataTask(with: urlRequest) { (data, _, error) in
if let error = error {
print(error)
Expand Down
2 changes: 2 additions & 0 deletions AzureCommunicationUI/AzureCommunicationUIDemoApp/Sources/EnvConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import AzureCommunicationUICalling
import SwiftUI

enum EnvConfig: String {
case aadToken
case appCenterSecret
case acsToken
case acsTokenUrl
Expand All @@ -26,6 +27,7 @@ enum EnvConfig: String {
}

class EnvConfigSubject: ObservableObject {
@Published var aadToken: String = EnvConfig.aadToken.value()
@Published var appCenterSecret: String = EnvConfig.appCenterSecret.value()
@Published var acsToken: String = EnvConfig.acsToken.value()
@Published var expiredAcsToken: String = EnvConfig.expiredAcsToken.value()
Expand Down
2 changes: 2 additions & 0 deletions AzureCommunicationUI/AzureCommunicationUIDemoApp/Sources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@
<string>${groupCallId}</string>
<key>teamsMeetingLink</key>
<string>${teamsMeetingLink}</string>
<key>aadToken</key>
<string>${aadToken}</string>
</dict>
</plist>
3 changes: 2 additions & 1 deletion AzureCommunicationUI/AzureCommunicationUIDemoApp/Sources/Views/SwiftUIDemoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ extension SwiftUIDemoView {
}
case .tokenUrl:
if let url = URL(string: envConfigSubject.acsTokenUrl) {
let tokenRefresher = AuthenticationHelper.getCommunicationToken(tokenUrl: url)
let tokenRefresher = AuthenticationHelper.getCommunicationToken(tokenUrl: url,
aadToken: envConfigSubject.aadToken)
let initialToken = await AuthenticationHelper.fetchInitialToken(with: tokenRefresher)
let communicationTokenRefreshOptions = CommunicationTokenRefreshOptions(initialToken: initialToken,
refreshProactively: true,
Expand Down