URL fixed
This commit is contained in:
parent
4a3e92aba5
commit
f10032a628
Binary file not shown.
@ -15,8 +15,9 @@ struct Constants {
|
|||||||
|
|
||||||
struct WebService {
|
struct WebService {
|
||||||
static let BASE = "www.ip-bc.org"
|
static let BASE = "www.ip-bc.org"
|
||||||
static let UPDATE = "https://update.ip-bc.org"
|
static let UPDATE = "https://ip-bc.org/ws/update/ip" //"http://localhost:8080/ip-bc.org/ws/update/dyndns"
|
||||||
static let GET_USERS_IP = "https://www.ip-bc.org/ws/info/ip"
|
static let GET_USERS_IP = "https://www.ip-bc.org/ws/info/ip" //"http://localhost:8080/ip-bc.org/ws/info/ip"
|
||||||
|
static let GET_MASTER_DOMAINS = "https://app.ip-bc.org/domains"
|
||||||
}
|
}
|
||||||
|
|
||||||
struct UserDefaults {
|
struct UserDefaults {
|
||||||
|
|||||||
@ -79,13 +79,18 @@ class WebserviceClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if self.isNetworkAvailableFirstCheck && self.isNetworkAvailable {
|
if self.isNetworkAvailableFirstCheck && self.isNetworkAvailable {
|
||||||
self.doUpdate()
|
self.thingsToDoOnNetworkAvailableRightAfterStart()
|
||||||
}
|
}
|
||||||
|
|
||||||
self.isNetworkAvailableFirstCheck = false
|
self.isNetworkAvailableFirstCheck = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func thingsToDoOnNetworkAvailableRightAfterStart() {
|
||||||
|
self.doUpdate()
|
||||||
|
//self.detectMasterDomains()
|
||||||
|
}
|
||||||
|
|
||||||
private func detectIP() {
|
private func detectIP() {
|
||||||
Alamofire.request(.GET, Constants.WebService.GET_USERS_IP, parameters: nil)
|
Alamofire.request(.GET, Constants.WebService.GET_USERS_IP, parameters: nil)
|
||||||
.validate(statusCode: 200..<201)
|
.validate(statusCode: 200..<201)
|
||||||
@ -120,6 +125,31 @@ class WebserviceClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func detectMasterDomains() {
|
||||||
|
Alamofire.request(.GET, Constants.WebService.GET_MASTER_DOMAINS, parameters: nil)
|
||||||
|
.validate(statusCode: 200..<201)
|
||||||
|
.validate(contentType: ["text/plain"])
|
||||||
|
.responseJSON { response in
|
||||||
|
/*
|
||||||
|
print(response.request) // original URL request
|
||||||
|
print(response.response) // URL response
|
||||||
|
print(response.data) // server data
|
||||||
|
print(response.result) // result of response serialization
|
||||||
|
*/
|
||||||
|
|
||||||
|
switch response.result {
|
||||||
|
case .Success:
|
||||||
|
if let responseJSON = response.result.value {
|
||||||
|
print("WebserviceClient: MasterDomains: \(responseJSON)")
|
||||||
|
//TODO: implement what to do now
|
||||||
|
}
|
||||||
|
case .Failure(let error):
|
||||||
|
print("WebserviceClient: Error during get current IP:")
|
||||||
|
print(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// MARK: Timer fire actions
|
// MARK: Timer fire actions
|
||||||
|
|
||||||
@objc func checkForNewIPTimerAction(timer : NSTimer) {
|
@objc func checkForNewIPTimerAction(timer : NSTimer) {
|
||||||
@ -144,15 +174,15 @@ class WebserviceClient {
|
|||||||
let headers = [
|
let headers = [
|
||||||
"Content-Type": "application/json"
|
"Content-Type": "application/json"
|
||||||
]
|
]
|
||||||
let parameters = [
|
/*let parameters = [
|
||||||
"domain": domain,
|
"domain": domain,
|
||||||
"token": token
|
"token": token
|
||||||
]
|
|
||||||
/*let parameters = [
|
|
||||||
"": "{\"domain\":\"\(domain)\", \"token\":\"\(token)\"}"
|
|
||||||
]*/
|
]*/
|
||||||
|
let parameters = [
|
||||||
|
"": "{\"domain\":\"\(domain)\", \"token\":\"\(token)\"}"
|
||||||
|
]
|
||||||
Alamofire.request(.POST, Constants.WebService.UPDATE, headers: headers, parameters: parameters)
|
Alamofire.request(.POST, Constants.WebService.UPDATE, headers: headers, parameters: parameters)
|
||||||
.validate(statusCode: 200..<201)
|
//.validate(statusCode: 200..<201)
|
||||||
//.validate(contentType: ["application/json"])
|
//.validate(contentType: ["application/json"])
|
||||||
.responseString { response in
|
.responseString { response in
|
||||||
/*
|
/*
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user