Skip to content

Commit

Permalink
correction
Browse files Browse the repository at this point in the history
  • Loading branch information
@kirillkotov
kirillkotov committed Mar 29, 2020
1 parent 071e7e7 commit d2eb1f9
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 36 deletions.
2 changes: 1 addition & 1 deletion HyberSDK.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
#

spec.name = "HyberSDK"
spec.version = "0.2.0"
spec.version = "0.2.1"
spec.summary = "A short description of HyberSDK."

# This description is used to generate tags and improve search results.
Expand Down
Binary file modified HyberSDK.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
38 changes: 20 additions & 18 deletions HyberSDK/HyberSDK.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ public class HyberSDK {
}

//Procedure 2. Delete registration
public func hyber_clear_current_device()->String {
public func hyber_clear_current_device()->HyberGeneralAnswerStruct {
do{
if (Constants.registrationstatus==true){
let X_Hyber_Session_Id: String = Constants.firebase_registration_token ?? "22"
let hyber_rest_server = HyberAPI.init()
let answer = hyber_rest_server.hyber_device_revoke(dev_list: [Constants.deviceId!], X_Hyber_Session_Id: X_Hyber_Session_Id, X_Hyber_Auth_Token: Constants.hyber_registration_token!)
return answer
} else {
return answer_b.general_answer(resp_code: "704", body_json: "error", description: "Not registered")
return answer_b.general_answer_struct(resp_code: "704", body_json: "error", description: "Not registered")
}
} catch let error {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

Expand All @@ -131,7 +131,7 @@ public class HyberSDK {
}
}

public func hyber_send_message_callback(message_id: String, message_text: String) -> String {
public func hyber_send_message_callback(message_id: String, message_text: String) -> HyberGeneralAnswerStruct {
do{
if (Constants.registrationstatus==true){
let X_Hyber_Session_Id: String = Constants.firebase_registration_token ?? "22"
Expand All @@ -141,15 +141,15 @@ public class HyberSDK {

return anss}
else {
return answer_b.general_answer(resp_code: "704", body_json: "error", description: "Not registered")
return answer_b.general_answer_struct(resp_code: "704", body_json: "error", description: "Not registered")
}
} catch let error {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

public func hyber_message_delivery_report(message_id: String) -> String {
public func hyber_message_delivery_report(message_id: String) -> HyberGeneralAnswerStruct {
do{
if (Constants.registrationstatus==true){
let X_Hyber_Session_Id: String = Constants.firebase_registration_token ?? "22"
Expand All @@ -162,15 +162,15 @@ public class HyberSDK {

return asaa}
else {
return answer_b.general_answer(resp_code: "704", body_json: "error", description: "Not registered")
return answer_b.general_answer_struct(resp_code: "704", body_json: "error", description: "Not registered")
}
} catch let error {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

public func hyber_update_registration() -> String {
public func hyber_update_registration() -> HyberGeneralAnswerStruct {
do{
if (Constants.registrationstatus==true){
let X_Hyber_Session_Id: String = Constants.firebase_registration_token ?? "22"
Expand All @@ -179,11 +179,11 @@ public class HyberSDK {
let ansss = hyber_rest_server.hyber_device_update(fcm_Token: Constants.firebase_registration_token!, os_Type: "ios", os_Version: Constants.dev_os_Version, device_Type: Constants.localizedModel, device_Name: UIDevice.modelName, sdk_Version: Constants.sdkVersion, X_Hyber_Session_Id: X_Hyber_Session_Id, X_Hyber_Auth_Token:Constants.hyber_registration_token!)
return ansss}
else {
return answer_b.general_answer(resp_code: "704", body_json: "error", description: "Not registered")
return answer_b.general_answer_struct(resp_code: "704", body_json: "error", description: "Not registered")
}
} catch let error {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

Expand All @@ -210,7 +210,7 @@ public class HyberSDK {
}


public func hyber_clear_all_device()->String {
public func hyber_clear_all_device()->HyberGeneralAnswerStruct {
do{

if (Constants.registrationstatus==true){
Expand Down Expand Up @@ -246,27 +246,29 @@ public class HyberSDK {

}
else {
return answer_b.general_answer(resp_code: "704", body_json: "error", description: "Not registered")
return answer_b.general_answer_struct(resp_code: "704", body_json: "error", description: "Not registered")
}

} catch {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

public func rewrite_msisdn(newmsisdn: String) {
public func rewrite_msisdn(newmsisdn: String) -> HyberGeneralAnswerStruct {
UserDefaults.standard.set(newmsisdn, forKey: "hyber_user_msisdn")
Constants.firebase_registration_token = newmsisdn
return HyberGeneralAnswerStruct.init(code: 200, result: "Ok", description: "Success", body: "newmsisdn: \(newmsisdn)")
}

public func rewrite_password(newpassword: String) {
public func rewrite_password(newpassword: String) -> HyberGeneralAnswerStruct{
UserDefaults.standard.set(newpassword, forKey: "hyber_user_password")
Constants.firebase_registration_token = newpassword
return HyberGeneralAnswerStruct.init(code: 200, result: "Ok", description: "Success", body: "newpassword: \(newpassword)")
}


public func hyber_check_queue()->HyberFunAnswerGeneral {
public func hyber_check_queue() -> HyberFunAnswerGeneral {
do{
if (Constants.registrationstatus==true){
let X_Hyber_Session_Id: String = Constants.firebase_registration_token ?? "22"
Expand Down
34 changes: 17 additions & 17 deletions HyberSDK/api/hyber_adapter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ class HyberAPI {

//2 procedure
//for revoke device from hyber server
func hyber_device_revoke(dev_list: [String], X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->String {
func hyber_device_revoke(dev_list: [String], X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->HyberGeneralAnswerStruct {
do{
let procedure_name = "hyber_device_revoke"
let configuration = URLSessionConfiguration .default
let session = URLSession(configuration: configuration)
var answ: String = String()
var answ: HyberGeneralAnswerStruct = HyberGeneralAnswerStruct.init(code: 0, result: "unknown", description: "unknown", body: "unknown")
let semaphore6 = DispatchSemaphore(value: 0)

let params = ["devices": dev_list] as Dictionary<String, AnyObject>
Expand Down Expand Up @@ -216,7 +216,7 @@ class HyberAPI {



answ = self.answer_buider.general_answer(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success")
answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success")

print(jsonData)
self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug")
Expand Down Expand Up @@ -266,19 +266,19 @@ class HyberAPI {
return answ
} catch {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}


//3 procedure
//for update device from hyber server
func hyber_device_update(fcm_Token: String, os_Type: String, os_Version: String, device_Type: String, device_Name: String, sdk_Version: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->String {
func hyber_device_update(fcm_Token: String, os_Type: String, os_Version: String, device_Type: String, device_Name: String, sdk_Version: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String) -> HyberGeneralAnswerStruct {
do{
let procedure_name = "hyber_device_update"
let configuration = URLSessionConfiguration .default
let session = URLSession(configuration: configuration)
var answ: String = String()
var answ: HyberGeneralAnswerStruct = HyberGeneralAnswerStruct.init(code: 0, result: "unknown", description: "unknown", body: "unknown")
let semaphore5 = DispatchSemaphore(value: 0)

let params = [
Expand Down Expand Up @@ -337,7 +337,7 @@ class HyberAPI {

let devid_parsed = self.jsonparser.updateregistrationJParse(str_resp: body_json)

answ = self.answer_buider.general_answer(resp_code: String(httpResponse.statusCode), body_json: "deviceId: \(devid_parsed.deviceId)", description: "Success")
answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: "deviceId: \(devid_parsed.deviceId)", description: "Success")

self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug")

Expand Down Expand Up @@ -376,7 +376,7 @@ class HyberAPI {
return answ
} catch {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

Expand Down Expand Up @@ -495,13 +495,13 @@ class HyberAPI {

//5 procedure
//for send delivery report to hyber server
func hyber_message_dr(message_Id: String, received_At: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->String {
func hyber_message_dr(message_Id: String, received_At: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->HyberGeneralAnswerStruct {
do{
if (message_Id != nil && message_Id != "" && message_Id != "[]" ) {
let procedure_name = "hyber_message_dr"
let configuration = URLSessionConfiguration .default
let session = URLSession(configuration: configuration)
var answ: String = String()
var answ: HyberGeneralAnswerStruct = HyberGeneralAnswerStruct.init(code: 0, result: "unknown", description: "unknown", body: "unknown")
let semaphore3 = DispatchSemaphore(value: 0)

let params = [
Expand Down Expand Up @@ -558,7 +558,7 @@ class HyberAPI {
//////self.logger.file_logger(message: "\(procedure_name) response jsonData is \(jsonData??["devices"])", loglevel: ".debug")
let body_json: String = String(decoding: receivedData, as: UTF8.self)

answ = self.answer_buider.general_answer(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success")
answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success")

self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug")

Expand Down Expand Up @@ -595,25 +595,25 @@ class HyberAPI {
semaphore3.wait()
return answ
} else {
return self.answer_buider.general_answer(resp_code: "700", body_json: "{\"error\":\"Incorrect input\"}", description: "Failed")
return self.answer_buider.general_answer_struct(resp_code: "700", body_json: "{\"error\":\"Incorrect input\"}", description: "Failed")
}

} catch {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}

}

//6 procedure
//for message callback to hyber server
func hyber_message_callback(message_Id: String, answer: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->String {
func hyber_message_callback(message_Id: String, answer: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->HyberGeneralAnswerStruct {
do {
let procedure_name = "hyber_message_callback"
let configuration = URLSessionConfiguration .default
let session = URLSession(configuration: configuration)
let semaphore2 = DispatchSemaphore(value: 0)
var answ: String = String()
var answ: HyberGeneralAnswerStruct = HyberGeneralAnswerStruct.init(code: 0, result: "unknown", description: "unknown", body: "unknown")
let params = [
"messageId":message_Id,
"answer": answer
Expand Down Expand Up @@ -664,7 +664,7 @@ class HyberAPI {
//////self.logger.file_logger(message: "\(procedure_name) response jsonData is \(jsonData??["devices"])", loglevel: ".debug")
let body_json: String = String(decoding: receivedData, as: UTF8.self)

answ = self.answer_buider.general_answer(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success")
answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success")

self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug")

Expand Down Expand Up @@ -704,7 +704,7 @@ class HyberAPI {
return answ
} catch {
print("invalid regex: \(error.localizedDescription)")
return answer_b.general_answer(resp_code: "710", body_json: "error", description: "Critical error")
return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error")
}
}

Expand Down
14 changes: 14 additions & 0 deletions HyberSDK/settings/hyber_answer_func.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ class AnswerBuider {
return resp
}

func general_answer_struct(resp_code: String, body_json: String, description: String) -> HyberGeneralAnswerStruct{
var resp: HyberGeneralAnswerStruct = HyberGeneralAnswerStruct.init(code: 0, result: "unknown", description: "unknown", body: "unknown")
if (resp_code=="200"){
resp = HyberGeneralAnswerStruct.init(code: 200, result: "Ok", description: "Success", body: body_json)
} else if (resp_code=="400"){
resp = HyberGeneralAnswerStruct.init(code: 400, result: "Failed", description: "Failed", body: "unknown")
} else {

resp = HyberGeneralAnswerStruct.init(code: Int(resp_code)!, result: "Failed", description: "Failed", body: body_json)
}

return resp
}

func general_answer2(resp_code: Int, body_json: String, description: String) -> HyberFunAnswerGeneral{
var resp: HyberFunAnswerGeneral?

Expand Down
7 changes: 7 additions & 0 deletions HyberSDK/settings/params.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ public struct HyberFunAnswerGetMessageHistory {
public var body: MessagesListResponse? = nil
}

public struct HyberGeneralAnswerStruct {
public var code: Int
public var result: String
public var description: String
public var body: String
}

public struct Constants {

public static var registrationstatus = UserDefaults.standard.bool(forKey: "registrationstatus")
Expand Down

0 comments on commit d2eb1f9

Please sign in to comment.