Skip to content

GitLab

Commit 979f2bb8 authored by Jose Blaya's avatar Jose Blaya
Browse files

Parse message

parent 9f9facb8
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 1 deletion
PIALibrary.xcodeproj/project.pbxproj
View file @ 979f2bb8
......@@ -246,6 +246,10 @@
82C374F82514DE7D00E391EE /* EndpointManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C374F42514DC6D00E391EE /* EndpointManagerTests.swift */; };
82C374F92514DE8200E391EE /* server.json in Resources */ = {isa = PBXBuildFile; fileRef = 82C374F62514DC7200E391EE /* server.json */; };
82C374FB2514DEC700E391EE /* EndpointManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C374FA2514DEC700E391EE /* EndpointManager.swift */; };
82CAB808255A9ACB00BB08EF /* InAppMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CAB807255A9ACB00BB08EF /* InAppMessage.swift */; };
82CAB809255A9ACB00BB08EF /* InAppMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CAB807255A9ACB00BB08EF /* InAppMessage.swift */; };
82CAB86A255AE6F100BB08EF /* Client+Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CAB869255AE6F100BB08EF /* Client+Messages.swift */; };
82CAB86B255AE6F100BB08EF /* Client+Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CAB869255AE6F100BB08EF /* Client+Messages.swift */; };
82DDD5302539CFDC0049E79E /* DIPTokenKeychainTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82DDD52F2539CFDC0049E79E /* DIPTokenKeychainTests.swift */; };
82E20B1124F652ED0065EFE3 /* AccountInfo+Kotlin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82E20B1024F652ED0065EFE3 /* AccountInfo+Kotlin.swift */; };
82E20B1224F652ED0065EFE3 /* AccountInfo+Kotlin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82E20B1024F652ED0065EFE3 /* AccountInfo+Kotlin.swift */; };
......@@ -568,6 +572,8 @@
82C374F42514DC6D00E391EE /* EndpointManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EndpointManagerTests.swift; sourceTree = "<group>"; };
82C374F62514DC7200E391EE /* server.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = server.json; sourceTree = "<group>"; };
82C374FA2514DEC700E391EE /* EndpointManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EndpointManager.swift; sourceTree = "<group>"; };
82CAB807255A9ACB00BB08EF /* InAppMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InAppMessage.swift; sourceTree = "<group>"; };
82CAB869255AE6F100BB08EF /* Client+Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Client+Messages.swift"; sourceTree = "<group>"; };
82DDD52F2539CFDC0049E79E /* DIPTokenKeychainTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DIPTokenKeychainTests.swift; sourceTree = "<group>"; };
82E20B1024F652ED0065EFE3 /* AccountInfo+Kotlin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AccountInfo+Kotlin.swift"; sourceTree = "<group>"; };
82E20B1524F6AA110065EFE3 /* RegionData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegionData.swift; sourceTree = "<group>"; };
......@@ -865,6 +871,7 @@
DD6768E222FAB19D00B9FDD0 /* AppStoreInformation.swift */,
82E20B1524F6AA110065EFE3 /* RegionData.swift */,
829EB63E2535C432003E74DD /* DedicatedIP.swift */,
82CAB807255A9ACB00BB08EF /* InAppMessage.swift */,
);
path = WebServices;
sourceTree = "<group>";
......@@ -1110,6 +1117,7 @@
0EBBC6DB1F9F64E700B8BD21 /* Client+Environment.swift */,
0ED2B5121F82444E00C9DB2B /* Client+Preferences.swift */,
0EF14E4A1FEAE6350007485A /* Client+Providers.swift */,
82CAB869255AE6F100BB08EF /* Client+Messages.swift */,
0EE78AEF1F818767002E4CDD /* ClientError.swift */,
0EE261DF1FEFD69F00E11955 /* Notification+Library.swift */,
);
......@@ -1717,6 +1725,7 @@
0E2ADCEA1FE0843000BB170C /* Macros+Pinger.swift in Sources */,
0E7BC6F71F96B1120035C8B2 /* WebServices.swift in Sources */,
0E7BC6E71F96B1000035C8B2 /* ClientError.swift in Sources */,
82CAB86B255AE6F100BB08EF /* Client+Messages.swift in Sources */,
0E53A8541FE5D73F000C2A18 /* Client+Mock.swift in Sources */,
0E2ADCDE1FE072ED00BB170C /* Pinger.m in Sources */,
0EB9667F1FDF36490086ABC2 /* GlossParser.swift in Sources */,
......@@ -1747,6 +1756,7 @@
DD8C3E652327EF6000BAD18E /* IKEv2EncryptionAlgorithm.swift in Sources */,
0EF14E4C1FEAE6350007485A /* Client+Providers.swift in Sources */,
0E7BC6E61F96B1000035C8B2 /* Client.swift in Sources */,
82CAB809255A9ACB00BB08EF /* InAppMessage.swift in Sources */,
0E392D7E1FE2E4C10002160D /* MemoryStore.swift in Sources */,
DD76292921ECDFF80092DF50 /* Usage.swift in Sources */,
0E2ADD381FE14F0000BB170C /* DefaultVPNProvider.swift in Sources */,
......@@ -1819,6 +1829,7 @@
0EC849C91F82329F002480CA /* WebServices.swift in Sources */,
0E9D62711FDE83BD009A90CF /* GlossServer.swift in Sources */,
0EE14D1B1FF16B39008D9AC2 /* InvalidatingFlowLayout.swift in Sources */,
82CAB808255A9ACB00BB08EF /* InAppMessage.swift in Sources */,
82183D7F25011D200033023F /* MagicLinkLoginViewController.swift in Sources */,
0EE1068C1F8250A1009514E9 /* Plan.swift in Sources */,
DD36CB7E21CCFFFB00FC815A /* CAGradientLayer+Image.swift in Sources */,
......@@ -1931,6 +1942,7 @@
DDFCFAB021E925B60081F235 /* Tileable.swift in Sources */,
0E4D4EA01FA4CA7A007DA6DA /* Validator.swift in Sources */,
0E0E5B111F8297D200022CD0 /* UserDefaultsStore.swift in Sources */,
82CAB86A255AE6F100BB08EF /* Client+Messages.swift in Sources */,
0E3D13D61F9E272B00434A48 /* GlossPayment.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
......
PIALibrary/Sources/Core/WebServices/InAppMessage.swift 0 → 100644
View file @ 979f2bb8
//
// InAppMessage.swift
// PIALibrary
//
// Created by Jose Blaya on 10/11/2020.
// Copyright © 2020 Private Internet Access, Inc.
//
// This file is part of the Private Internet Access iOS Client.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
import Foundation
import PIAAccount
public enum InAppMessageType {
case action
case view
case link
}
public struct InAppMessage {
private let message: [String: String]
private let linkMessage: [String: String]
private let type: InAppMessageType
private let settingAction: [String: Bool]?
private let settingView: String?
private let settingLink: String?
init(withMessage messageInformation: MessagesInformation.Message) {
self.message = messageInformation.message
self.linkMessage = messageInformation.link.text
if !messageInformation.link.action.settings.isEmpty {
self.type = .action
var actions = [String: Bool]()
for setting in messageInformation.link.action.settings {
actions[setting.key] = setting.value.boolValue
}
self.settingAction = actions
self.settingLink = nil
self.settingView = nil
} else if !messageInformation.link.action.uri.isEmpty {
self.type = .link
self.settingLink = messageInformation.link.action.uri
self.settingAction = nil
self.settingView = nil
} else {
self.type = .view
self.settingView = messageInformation.link.action.view
self.settingLink = nil
self.settingAction = nil
}
}
}
PIALibrary/Sources/Library/Client+Messages.swift 0 → 100644
View file @ 979f2bb8
//
// Client+Messages.swift
// PIALibrary
//
// Created by Jose Blaya on 10/11/2020.
// Copyright © 2020 Private Internet Access, Inc.
//
// This file is part of the Private Internet Access iOS Client.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
import Foundation
PIALibrary/Sources/Library/WebServices/PIAWebServices.swift
View file @ 979f2bb8
......@@ -419,6 +419,34 @@ class PIAWebServices: WebServices, ConfigurationAccess {
}
}
// MARK: Messages
func messages(_ callback: SuccessLibraryCallback?) {
if let token = Client.providers.accountProvider.token {
self.accountAPI.messages(token: token, callback: { (messages, error) in
if let error = error {
callback?(ClientError.malformedResponseData)
return
}
if let message = messages.first {
let inAppMessage = InAppMessage(withMessage: message)
//Client.message...
}
callback?(nil)
})
} else {
callback?(ClientError.unauthorized)
}
}
// MARK: Helpers
......
Podfile
View file @ 979f2bb8
......@@ -19,7 +19,7 @@ abstract_target 'PIALibrary' do
pod 'PopupDialog'
pod 'TunnelKit', :git => 'https://github.com/pia-foss/tunnelkit', :commit => 'd19b9de'
pod 'PIAWireguard', :git => "https://github.com/pia-foss/ios-wireguard"
pod "PIAAccountModule", :path => "/Users/jose/Projects/PIA/account"
pod "PIAAccountModule", :git => "https://github.com/pia-foss/mobile-common-account"
pod 'PIARegions', :git => "https://github.com/pia-foss/mobile-common-regions"
target 'PIALibrary-iOS' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment