ibm-bluemix-mobile-services / bms-clientsdk-swift-push / 581

pending completion

Build # 581

Build Type

Pull #98

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/<a class=hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/<a class="double-link" href="https://git"><a class=hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/<a class="double-link" href="https://git"><a class=hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/<a class="double-link" href="https://git"><a class=hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/3e7855e03d88b3742bad4e61ac8d33035831a632">3e7855e03">&lt;a href=&quot;https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/</a><a class="double-link" href="https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/3e7855e03d88b3742bad4e61ac8d33035831a632">3e7855e03</a><a href="https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/3e7855e03d88b3742bad4e61ac8d33035831a632">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/3e7855e03d88b3742bad4e61ac8d33035831a632&quot;&gt;3e7855e03&lt;/a&gt;&lt;a href=&quot;https://github.com/ibm-bluemix-mobile-services/bms-clientsdk-swift-push/commit/3e7855e03d88b3742bad4e61ac8d33035831a632&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github... (continued)

Pull Request Pull Request #98: New version 3.6.0

Run Details

101 of 101 new or added lines in 2 files covered. (100.0%)

367 of 401 relevant lines covered (91.52%)

2.92 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

96.55

/Source/BMSPushUrlBuilder.swift

/*
 *     Copyright 2016 IBM Corp.
 *     Licensed under the Apache License, Version 2.0 (the "License");
 *     you may not use this file except in compliance with the License.
 *     You may obtain a copy of the License at
 *     http://www.apache.org/licenses/LICENSE-2.0
 *     Unless required by applicable law or agreed to in writing, software
 *     distributed under the License is distributed on an "AS IS" BASIS,
 *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *     See the License for the specific language governing permissions and
 *     limitations under the License.
 */

import UIKit
import BMSCore

// MARK: - Swift 3 & Swift 4
#if swift(>=3.0)

internal class BMSPushUrlBuilder: NSObject {
    
    internal let FORWARDSLASH = "/";
    internal let IMFPUSH = "imfpush";
    internal let JPIMFPUSH = "jp-tok.imfpush.cloud.ibm.com"
    internal let V1 = "v1";
    internal let APPS = "apps";
    internal let AMPERSAND = "&";
    internal let QUESTIONMARK = "?";
    internal let SUBZONE = "subzone";
    internal let EQUALTO = "=";
    internal let SUBSCRIPTIONS = "subscriptions";
    internal let MESSAGES = "messages"
    internal let TAGS = "tags";
    internal let DEVICES = "devices";
    internal let TAGNAME = "tagName";
    internal let DEVICEID = "deviceId";
    internal let defaultProtocol = "https";
    internal let HOST_NAME = "imfpush.cloud.ibm.com"
    internal let DOT = "."
    internal let IMFPUSH_PUSH_WORKS_SERVER_CONTEXT  = "imfpush/v1/apps"

    internal final var pwUrl_ = ""
    internal final var reWritedomain = ""
    internal final var clientSecretHeader = ""
    
    init(applicationID:String, clientSecret:String) {
        
        super.init()
        
        if !(clientSecret.isEmpty) {
            clientSecretHeader = clientSecret
        }
        
        if(!BMSPushClient.overrideServerHost.isEmpty){
            pwUrl_ += BMSPushClient.overrideServerHost
            reWritedomain = BMSPushClient.overrideServerHost
        } else {
            pwUrl_ += defaultProtocol
            pwUrl_ += "://"
            pwUrl_ += self.getRegion()
            pwUrl_ += DOT
            pwUrl_ += HOST_NAME
        }
        pwUrl_ += FORWARDSLASH
        pwUrl_ += IMFPUSH_PUSH_WORKS_SERVER_CONTEXT
        pwUrl_ += FORWARDSLASH
        pwUrl_ += applicationID
        pwUrl_ += FORWARDSLASH
    }
    
    func addHeader() -> [String: String] {
        
        if reWritedomain.isEmpty {
            if(clientSecretHeader.isEmpty){
                return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON]
            }
            return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON, IMFPUSH_CLIENT_SECRET:clientSecretHeader]
        }
        else{
            if clientSecretHeader.isEmpty {
                return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON, IMFPUSH_X_REWRITE_DOMAIN:reWritedomain]
            }
            return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON, IMFPUSH_X_REWRITE_DOMAIN:reWritedomain, IMFPUSH_CLIENT_SECRET:clientSecretHeader]
        }
        
    }
    
    
    func getSubscribedDevicesUrl(devID:String) -> String {
        
        var deviceIdUrl:String = getDevicesUrl()
        deviceIdUrl += FORWARDSLASH
        deviceIdUrl += devID
        return deviceIdUrl
    }
    
    func getDevicesUrl() -> String {
        
        return getCollectionUrl(collectionName: DEVICES)
    }
    
    func getTagsUrl() -> String {
        
        return getCollectionUrl(collectionName: TAGS)
    }
    
    func getSubscriptionsUrl() -> String {
        
        return getCollectionUrl(collectionName: SUBSCRIPTIONS)
    }
    
    func getAvailableSubscriptionsUrl(deviceId : String) -> String {
        
        var subscriptionURL = getCollectionUrl(collectionName: SUBSCRIPTIONS)
        subscriptionURL += QUESTIONMARK
        subscriptionURL += "deviceId=\(deviceId)"
        
        return subscriptionURL;
    }
    
    func getUnSubscribetagsUrl() -> String {
        
        var unSubscriptionURL = getCollectionUrl(collectionName: SUBSCRIPTIONS)
        unSubscriptionURL += QUESTIONMARK
        unSubscriptionURL += IMFPUSH_ACTION_DELETE
        
        return unSubscriptionURL
    }
    
    func getUnregisterUrl (deviceId : String) -> String {
        
        var deviceUnregisterUrl:String = getDevicesUrl()
        deviceUnregisterUrl += FORWARDSLASH
        deviceUnregisterUrl += deviceId
        
        return deviceUnregisterUrl
    }
    
    func getSendMessageDeliveryStatus (messageId : String) -> String {
        
        var sendMessageDeliveryStatusUrl:String = getCollectionUrl(collectionName: MESSAGES)
        sendMessageDeliveryStatusUrl += FORWARDSLASH
        sendMessageDeliveryStatusUrl += messageId
        return sendMessageDeliveryStatusUrl
    }
    
    
    internal func getCollectionUrl (collectionName:String) -> String {
        
        var collectionUrl:String = pwUrl_
        collectionUrl += collectionName
        
        return collectionUrl
    }
    
    internal func getRegion() -> String {
        
        switch BMSClient.sharedInstance.bluemixRegion {
        case BMSClient.Region.usSouth:
            return "us-south"
        case BMSClient.Region.germany:
            return "eu-de"
        case BMSClient.Region.jpTok:
            return "jp-tok"
        case BMSClient.Region.sydney:
            return "au-syd"
        case BMSClient.Region.unitedKingdom:
            return "eu-gb"
        case BMSClient.Region.usEast:
            return "us-east"
        default:
            return "us-south"
        }
    }
}
#endif

1	/*
2	* Copyright 2016 IBM Corp.
3	* Licensed under the Apache License, Version 2.0 (the "License");
4	* you may not use this file except in compliance with the License.
5	* You may obtain a copy of the License at
6	* http://www.apache.org/licenses/LICENSE-2.0
7	* Unless required by applicable law or agreed to in writing, software
8	* distributed under the License is distributed on an "AS IS" BASIS,
9	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10	* See the License for the specific language governing permissions and
11	* limitations under the License.
12	*/
13
14	import UIKit
15	import BMSCore
16
17	// MARK: - Swift 3 & Swift 4
18	#if swift(>=3.0)
19
20	internal class BMSPushUrlBuilder: NSObject {
21
22	internal let FORWARDSLASH = "/";
23	internal let IMFPUSH = "imfpush";
24	internal let JPIMFPUSH = "jp-tok.imfpush.cloud.ibm.com"
25	internal let V1 = "v1";
26	internal let APPS = "apps";
27	internal let AMPERSAND = "&";
28	internal let QUESTIONMARK = "?";
29	internal let SUBZONE = "subzone";
30	internal let EQUALTO = "=";
31	internal let SUBSCRIPTIONS = "subscriptions";
32	internal let MESSAGES = "messages"
33	internal let TAGS = "tags";
34	internal let DEVICES = "devices";
35	internal let TAGNAME = "tagName";
36	internal let DEVICEID = "deviceId";
37	internal let defaultProtocol = "https";
38	internal let HOST_NAME = "imfpush.cloud.ibm.com"
39	internal let DOT = "."
40	internal let IMFPUSH_PUSH_WORKS_SERVER_CONTEXT = "imfpush/v1/apps"
41
42	internal final var pwUrl_ = ""
43	internal final var reWritedomain = ""
44	internal final var clientSecretHeader = ""
45
46	init(applicationID:String, clientSecret:String) {	17✔
47		17✔
48	super.init()	17✔
49		17✔
50	if !(clientSecret.isEmpty) {	17✔
51	clientSecretHeader = clientSecret	15✔
52	}	17✔
53		17✔
54	if(!BMSPushClient.overrideServerHost.isEmpty){	17✔
55	pwUrl_ += BMSPushClient.overrideServerHost	11✔
56	reWritedomain = BMSPushClient.overrideServerHost	11✔
57	} else {	17✔
58	pwUrl_ += defaultProtocol	6✔
59	pwUrl_ += "://"	6✔
60	pwUrl_ += self.getRegion()	6✔
61	pwUrl_ += DOT	6✔
62	pwUrl_ += HOST_NAME	6✔
63	}	17✔
64	pwUrl_ += FORWARDSLASH	17✔
65	pwUrl_ += IMFPUSH_PUSH_WORKS_SERVER_CONTEXT	17✔
66	pwUrl_ += FORWARDSLASH	17✔
67	pwUrl_ += applicationID	17✔
68	pwUrl_ += FORWARDSLASH	17✔
69	}	17✔
70
71	func addHeader() -> [String: String] {	9✔
72		9✔
73	if reWritedomain.isEmpty {	9✔
74	if(clientSecretHeader.isEmpty){	6✔
75	return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON]	×
76	}	6✔
77	return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON, IMFPUSH_CLIENT_SECRET:clientSecretHeader]	6✔
78	}	6✔
79	else{	3✔
80	if clientSecretHeader.isEmpty {	3✔
81	return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON, IMFPUSH_X_REWRITE_DOMAIN:reWritedomain]	2✔
82	}	2✔
83	return [IMFPUSH_CONTENT_TYPE_KEY:IMFPUSH_CONTENT_TYPE_JSON, IMFPUSH_X_REWRITE_DOMAIN:reWritedomain, IMFPUSH_CLIENT_SECRET:clientSecretHeader]	1✔
84	}	3✔
85		×
86	}	×
87
88
89	func getSubscribedDevicesUrl(devID:String) -> String {	1✔
90		1✔
91	var deviceIdUrl:String = getDevicesUrl()	1✔
92	deviceIdUrl += FORWARDSLASH	1✔
93	deviceIdUrl += devID	1✔
94	return deviceIdUrl	1✔
95	}	1✔
96
97	func getDevicesUrl() -> String {	3✔
98		3✔
99	return getCollectionUrl(collectionName: DEVICES)	3✔
100	}	3✔
101
102	func getTagsUrl() -> String {	1✔
103		1✔
104	return getCollectionUrl(collectionName: TAGS)	1✔
105	}	1✔
106
107	func getSubscriptionsUrl() -> String {	1✔
108		1✔
109	return getCollectionUrl(collectionName: SUBSCRIPTIONS)	1✔
110	}	1✔
111
112	func getAvailableSubscriptionsUrl(deviceId : String) -> String {	1✔
113		1✔
114	var subscriptionURL = getCollectionUrl(collectionName: SUBSCRIPTIONS)	1✔
115	subscriptionURL += QUESTIONMARK	1✔
116	subscriptionURL += "deviceId=\(deviceId)"	1✔
117		1✔
118	return subscriptionURL;	1✔
119	}	1✔
120
121	func getUnSubscribetagsUrl() -> String {	1✔
122		1✔
123	var unSubscriptionURL = getCollectionUrl(collectionName: SUBSCRIPTIONS)	1✔
124	unSubscriptionURL += QUESTIONMARK	1✔
125	unSubscriptionURL += IMFPUSH_ACTION_DELETE	1✔
126		1✔
127	return unSubscriptionURL	1✔
128	}	1✔
129
130	func getUnregisterUrl (deviceId : String) -> String {	1✔
131		1✔
132	var deviceUnregisterUrl:String = getDevicesUrl()	1✔
133	deviceUnregisterUrl += FORWARDSLASH	1✔
134	deviceUnregisterUrl += deviceId	1✔
135		1✔
136	return deviceUnregisterUrl	1✔
137	}	1✔
138
139	func getSendMessageDeliveryStatus (messageId : String) -> String {	1✔
140		1✔
141	var sendMessageDeliveryStatusUrl:String = getCollectionUrl(collectionName: MESSAGES)	1✔
142	sendMessageDeliveryStatusUrl += FORWARDSLASH	1✔
143	sendMessageDeliveryStatusUrl += messageId	1✔
144	return sendMessageDeliveryStatusUrl	1✔
145	}	1✔
146
147
148	internal func getCollectionUrl (collectionName:String) -> String {	8✔
149		8✔
150	var collectionUrl:String = pwUrl_	8✔
151	collectionUrl += collectionName	8✔
152		8✔
153	return collectionUrl	8✔
154	}	8✔
155
156	internal func getRegion() -> String {	6✔
157		6✔
158	switch BMSClient.sharedInstance.bluemixRegion {	6✔
159	case BMSClient.Region.usSouth:	6✔
160	return "us-south"	1✔
161	case BMSClient.Region.germany:	6✔
162	return "eu-de"	1✔
163	case BMSClient.Region.jpTok:	6✔
164	return "jp-tok"	1✔
165	case BMSClient.Region.sydney:	6✔
166	return "au-syd"	1✔
167	case BMSClient.Region.unitedKingdom:	6✔
168	return "eu-gb"	1✔
169	case BMSClient.Region.usEast:	6✔
170	return "us-east"	1✔
171	default:	6✔
172	return "us-south"	×
173	}	6✔
174	}	6✔
175	}
176	#endif

ibm-bluemix-mobile-services / bms-clientsdk-swift-push / 581

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous