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

Privacy: IS Settings: Add an IS

Browse Source
This commit is contained in:
manuroe
2019-09-25 14:32:55 +02:00
parent 74f111b34e
commit 9ed6f05fd1
6 changed files with 108 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/IdentityServer/SettingsIdentityServerViewModel.swift
+30 -18
View File
@@ -86,12 +86,15 @@ final class SettingsIdentityServerViewModel: SettingsIdentityServerViewModelType
switch identityServerValidity {
case .invalid:
// Present invalid IS alert
// TODO but how to detect it?
break
case .valid(status: let termsStatus):
switch termsStatus {
case .noTerms:
// Present no terms alert
break
self.update(viewState: .alert(alert: SettingsIdentityServerAlert.addActionAlert(.noTerms(newHost: newIdentityServer)), onContinue: {
self.update(viewState: .loading)
self.updateAccountDataAndRefreshViewState(with: newIdentityServer)
}))
case .terms(agreed: let termsAgreed):
if termsAgreed {
self.updateAccountDataAndRefreshViewState(with: newIdentityServer)
@@ -116,6 +119,9 @@ final class SettingsIdentityServerViewModel: SettingsIdentityServerViewModelType
}
private func updateAccountDataAndRefreshViewState(with identityServer: String) {
// TODO: We should get a token in intermediate step
self.session.setIdentityServer(identityServer, andAccessToken: nil)
self.session.setAccountDataIdentityServer(identityServer, success: {
self.refreshIdentityServerViewState()
}, failure: { error in
@@ -182,31 +188,37 @@ final class SettingsIdentityServerViewModel: SettingsIdentityServerViewModelType
let restClient: MXRestClient = self.session.matrixRestClient
let identityService = MXIdentityService(identityServer: identityServerURL, accessToken: nil, homeserverRestClient: restClient)
identityService.accessToken { response in
// First, check the server
identityService.pingIdentityServer { response in
self.validationIdentityService = nil
switch response {
case .success(let accessToken):
let serviceTerms = MXServiceTerms(baseUrl: identityService.identityServer, serviceType: MXServiceTypeIdentityService, matrixSession: self.session, accessToken: accessToken)
serviceTerms.areAllTermsAgreed({ (areAllTermsAgreed) in
completion(.success(IdentityServerValidity.valid(status: .terms(agreed: areAllTermsAgreed))))
case .success:
// Them, check if there are terms to accept
let serviceTerms = MXServiceTerms(baseUrl: identityService.identityServer, serviceType: MXServiceTypeIdentityService, matrixSession: self.session, accessToken: nil)
serviceTerms.areAllTermsAgreed({ (agreedTermsProgress) in
self.validationServiceTerms = nil
if agreedTermsProgress.totalUnitCount == 0 {
completion(.success(IdentityServerValidity.valid(status: .noTerms)))
} else {
completion(.success(IdentityServerValidity.valid(status: .terms(agreed: agreedTermsProgress.isFinished))))
}
}, failure: { (error) in
self.validationServiceTerms = nil
}, failure: { error in
completion(.failure(error))
self.validationServiceTerms = nil
})
self.validationServiceTerms = serviceTerms
case .failure(let error):
completion(.failure(error))
}
self.validationIdentityService = nil
}
self.validationIdentityService = identityService
}