@@ -25,21 +25,17 @@ module.exports = class IPGeolocationAPI {
25
25
}
26
26
27
27
getUserAgent ( callback , uaString = "" ) {
28
- var jsonData = "{\"uaString\":\"" + uaString + "\"}" ;
28
+ var jsonData = JSON . stringify ( {
29
+ "uaString" : uaString
30
+ } ) ;
31
+
29
32
postRequest ( 'user-agent' , "apiKey=" + this . apiKey , jsonData , callback ) ;
30
33
}
31
34
32
35
getBulkUserAgent ( callback , uaStrings = [ ] ) {
33
- var jsonData = "{\"uaStrings\":[" ;
34
- for ( let i = 0 ; i < uaStrings . length ; i ++ ) {
35
- if ( i === 0 ) {
36
- jsonData = jsonData . concat ( "\"" + uaStrings [ i ] + "\"" ) ;
37
- } else {
38
- jsonData = jsonData . concat ( "," ) ;
39
- jsonData = jsonData . concat ( "\"" + uaStrings [ i ] + "\"" ) ;
40
- }
41
- }
42
- jsonData = jsonData . concat ( "]}" ) ;
36
+ var jsonData = JSON . stringify ( {
37
+ "uaStrings" : uaStrings
38
+ } ) ;
43
39
44
40
postRequest ( 'user-agent-bulk' , "apiKey=" + this . apiKey , jsonData , callback ) ;
45
41
}
@@ -96,6 +92,7 @@ function buildGeolocationUrlParams(apiKey = '', geolocationParams = null) {
96
92
if ( geolocationParams . isIncludeHostname ( ) || geolocationParams . isIncludeHostnameFallbackLive ( ) || geolocationParams . isIncludeLiveHostname ( ) || geolocationParams . isIncludeSecurity ( ) || geolocationParams . isIncludeUserAgent ( ) ) {
97
93
var val = "" ;
98
94
var includeHost = false ;
95
+
99
96
if ( geolocationParams . isIncludeHostname ( ) ) {
100
97
val = "hostname" ;
101
98
includeHost = true ;
@@ -106,28 +103,33 @@ function buildGeolocationUrlParams(apiKey = '', geolocationParams = null) {
106
103
val = "liveHostname" ;
107
104
includeHost = true ;
108
105
}
106
+
109
107
if ( geolocationParams . isIncludeSecurity ( ) ) {
110
108
if ( includeHost ) {
111
109
val = val + ",security" ;
112
110
} else {
113
111
val = "security" ;
114
112
}
115
113
}
114
+
116
115
if ( geolocationParams . isIncludeUserAgent ( ) ) {
117
116
if ( includeHost || geolocationParams . isIncludeSecurity ( ) ) {
118
117
val = val + ",useragent" ;
119
118
} else {
120
119
val = "useragent" ;
121
120
}
122
121
}
122
+
123
123
if ( urlParams ) {
124
124
urlParams = urlParams . concat ( '&' ) ;
125
125
}
126
+
126
127
urlParams = urlParams . concat ( 'include=' , val ) ;
127
128
128
129
}
129
130
130
131
}
132
+
131
133
return urlParams ;
132
134
}
133
135
@@ -167,6 +169,7 @@ function buildTimezoneUrlParams(apiKey = '', timezoneParams = null) {
167
169
if ( urlParams ) {
168
170
urlParams = urlParams . concat ( '&' ) ;
169
171
}
172
+
170
173
urlParams = urlParams . concat ( 'lat=' , timezoneParams . getLatitude ( ) , '&long=' , timezoneParams . getLongitude ( ) ) ;
171
174
}
172
175
0 commit comments