popbill 1.15.1 → 1.16.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/popbill.rb +23 -7
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0bfb35ee55f47c39313b772f5c2989a036568c87
|
4
|
+
data.tar.gz: e5c7df56dd0c1390397df455dae91ce91d81b363
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 964b15e2850c1c085ce3922e43ec5479331497e25fd698e8d5e281fb9484048b7237b5a62a3268a153339e04415e706bed4a91f936839f7f724872c526840319
|
7
|
+
data.tar.gz: d85e2d027ad6d182ffaf3c88213037a45d19ba4f355f59ae48f9d7a865452425ba2831b4b0c7837e6434cf14d54acf6727b00b0bf3e5870ede620cbe4e645b91
|
data/lib/popbill.rb
CHANGED
@@ -11,10 +11,13 @@ class BaseService
|
|
11
11
|
ServiceID_TEST = "POPBILL_TEST"
|
12
12
|
ServiceURL_REAL = "https://popbill.linkhub.co.kr"
|
13
13
|
ServiceURL_TEST = "https://popbill-test.linkhub.co.kr"
|
14
|
+
ServiceURL_GA_REAL = "https://ga-popbill.linkhub.co.kr"
|
15
|
+
ServiceURL_GA_TEST = "https://ga-popbill-test.linkhub.co.kr"
|
16
|
+
|
14
17
|
POPBILL_APIVersion = "1.0"
|
15
18
|
BOUNDARY = "==POPBILL_RUBY_SDK=="
|
16
19
|
|
17
|
-
attr_accessor :token_table, :scopes, :isTest, :linkhub, :ipRestrictOnOff
|
20
|
+
attr_accessor :token_table, :scopes, :isTest, :linkhub, :ipRestrictOnOff, :useStaticIP
|
18
21
|
|
19
22
|
# Generate Linkhub Class Singleton Instance
|
20
23
|
class << self
|
@@ -24,6 +27,7 @@ class BaseService
|
|
24
27
|
@instance.linkhub = Linkhub.instance(linkID, secretKey)
|
25
28
|
@instance.scopes = ["member"]
|
26
29
|
@instance.ipRestrictOnOff = true
|
30
|
+
@instance.useStaticIP = false
|
27
31
|
|
28
32
|
return @instance
|
29
33
|
end
|
@@ -45,8 +49,17 @@ class BaseService
|
|
45
49
|
@ipRestrictOnOff = value
|
46
50
|
end
|
47
51
|
|
52
|
+
def setUseStaticIP(value)
|
53
|
+
@useStaticIP = value
|
54
|
+
end
|
55
|
+
|
48
56
|
def getServiceURL()
|
49
|
-
|
57
|
+
if @useStaticIP
|
58
|
+
return @isTest ? BaseService::ServiceURL_GA_TEST : BaseService::ServiceURL_GA_REAL
|
59
|
+
else
|
60
|
+
return @isTest ? BaseService::ServiceURL_TEST : BaseService::ServiceURL_REAL
|
61
|
+
end
|
62
|
+
|
50
63
|
end
|
51
64
|
|
52
65
|
def getServiceID()
|
@@ -68,7 +81,7 @@ class BaseService
|
|
68
81
|
else
|
69
82
|
# Token's expireTime must use parse() because time format is hh:mm:ss.SSSZ
|
70
83
|
expireTime = DateTime.parse(targetToken['expiration'])
|
71
|
-
serverUTCTime = DateTime.strptime(@linkhub.getTime())
|
84
|
+
serverUTCTime = DateTime.strptime(@linkhub.getTime(@useStaticIP))
|
72
85
|
refresh = expireTime < serverUTCTime
|
73
86
|
end
|
74
87
|
|
@@ -76,7 +89,7 @@ class BaseService
|
|
76
89
|
begin
|
77
90
|
# getSessionToken from Linkhub
|
78
91
|
targetToken = @linkhub.getSessionToken(
|
79
|
-
@isTest ? ServiceID_TEST : ServiceID_REAL, corpNum, @scopes, @ipRestrictOnOff ? "" : "*")
|
92
|
+
@isTest ? ServiceID_TEST : ServiceID_REAL, corpNum, @scopes, @ipRestrictOnOff ? "" : "*", @useStaticIP)
|
80
93
|
|
81
94
|
rescue LinkhubException => le
|
82
95
|
raise PopbillException.new(le.code, le.message)
|
@@ -112,6 +125,7 @@ class BaseService
|
|
112
125
|
end
|
113
126
|
|
114
127
|
uri = URI(getServiceURL() + url)
|
128
|
+
|
115
129
|
request = Net::HTTP.new(uri.host, 443)
|
116
130
|
request.use_ssl = true
|
117
131
|
|
@@ -224,6 +238,7 @@ class BaseService
|
|
224
238
|
# Add the file Data
|
225
239
|
|
226
240
|
uri = URI(getServiceURL() + url)
|
241
|
+
|
227
242
|
https = Net::HTTP.new(uri.host, 443)
|
228
243
|
https.use_ssl = true
|
229
244
|
Net::HTTP::Post.new(uri)
|
@@ -284,6 +299,7 @@ class BaseService
|
|
284
299
|
# Add the file Data
|
285
300
|
|
286
301
|
uri = URI(getServiceURL() + url)
|
302
|
+
|
287
303
|
https = Net::HTTP.new(uri.host, 443)
|
288
304
|
https.use_ssl = true
|
289
305
|
Net::HTTP::Post.new(uri)
|
@@ -310,7 +326,7 @@ class BaseService
|
|
310
326
|
end
|
311
327
|
|
312
328
|
begin
|
313
|
-
@linkhub.getBalance(getSession_Token(corpNum), getServiceID())
|
329
|
+
@linkhub.getBalance(getSession_Token(corpNum), getServiceID(), @useStaticIP)
|
314
330
|
rescue LinkhubException => le
|
315
331
|
raise PopbillException.new(le.code, le.message)
|
316
332
|
end
|
@@ -323,7 +339,7 @@ class BaseService
|
|
323
339
|
end
|
324
340
|
|
325
341
|
begin
|
326
|
-
@linkhub.getPartnerBalance(getSession_Token(corpNum), getServiceID())
|
342
|
+
@linkhub.getPartnerBalance(getSession_Token(corpNum), getServiceID(), @useStaticIP)
|
327
343
|
rescue LinkhubException => le
|
328
344
|
raise PopbillException.new(le.code, le.message)
|
329
345
|
end
|
@@ -336,7 +352,7 @@ class BaseService
|
|
336
352
|
end
|
337
353
|
|
338
354
|
begin
|
339
|
-
@linkhub.getPartnerURL(getSession_Token(corpNum), getServiceID(), togo)
|
355
|
+
@linkhub.getPartnerURL(getSession_Token(corpNum), getServiceID(), togo, @useStaticIP)
|
340
356
|
rescue LinkhubException => le
|
341
357
|
raise PopbillException.new(le.code, le.message)
|
342
358
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: popbill
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.16.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Linkhub Dev
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-07-
|
11
|
+
date: 2020-07-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: linkhub
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.
|
19
|
+
version: 1.3.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.
|
26
|
+
version: 1.3.1
|
27
27
|
description: Popbill API SDK
|
28
28
|
email: code@linkhub.co.kr
|
29
29
|
executables: []
|