linkhub 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3768023fa4fe1ccd7dadd77464dfa0bf1fd29c
-  data.tar.gz: 6c80f61b1c10d79203285015b41ee9f0fa8c4a00
+  metadata.gz: 912337f638e0b6c8a6ca840e650d9704427c340b
+  data.tar.gz: 193e4df9e4e57be0cfd80ded797bfbdb6b962cf0
 SHA512:
-  metadata.gz: 5060684e259865f9822f8dfcdf256b91cea54c225f01897812d971fc172f964f372b8111f53ba42c5d58682a1aa451ae08d9d94634f4cacbc5875854d7aff0c9
-  data.tar.gz: 7092122b0b89f592597db3dc026d06df387f7ddc72d02e24c422943010c3d2971ad8ab960e1b04e297c582b4f127acf9f99fc25e9baa9ee7b6dd4e02e7d34de5
+  metadata.gz: 21573eb23b6bd124a46f8eb27a23425e474f593bcb3c1de8c14113c716d6487cdcb6c43a6445631993700cc4f08fa187f7a6be08263133e3a3315ff12c79b0e7
+  data.tar.gz: 3289ac44a1faf5b03e443cb81dea5c683e496179e64c14d187ccb1c5cf4b22c11ad56c322ad2b838f6491197371c97ec052caa426d343bac496c30a76fad8bf9

data/lib/linkhub.rb

@@ -4,6 +4,9 @@ require "uri"
 require "json"
 require "digest"
 require "base64"
+require 'zlib'
+require 'stringio'
+require 'openssl'
 
 # Linkhub API Base Class
 class Linkhub
@@ -23,14 +26,8 @@ class Linkhub
     private :new
   end
 
-  def gzip_parse (target)
-    sio = StringIO.new(target)
-    gz = Zlib::GzipReader.new(sio)
-    gz.read()
-  end
-
   # Get SessionToken for Bearer Token
-  def getSessionToken(serviceid, accessid, scope)
+  def getSessionToken(serviceid, accessid, scope, forwardip="")
     uri = URI(LINKHUB_ServiceURL + "/" + serviceid + "/Token")
     postData = {:access_id => accessid, :scope => scope}.to_json
 
@@ -39,6 +36,11 @@ class Linkhub
     hmacTarget = "POST\n"
     hmacTarget += Base64.strict_encode64(Digest::MD5.digest(postData)) + "\n"
     hmacTarget += apiServerTime + "\n"
+
+    if forwardip != ""
+      hmacTarget += forwardip + "\n"
+    end
+
     hmacTarget += LINKHUB_APIVersion + "\n"
     hmacTarget += "/" + serviceid + "/Token"
 
@@ -46,37 +48,36 @@ class Linkhub
 
     data = hmacTarget
     digest = OpenSSL::Digest.new("sha1")
-    hmac = Base64.encode64(OpenSSL::HMAC.digest(digest, key, data))
+    hmac = Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, data))
 
     headers = {
-      "Content-Type" => "application/json; charset=utf8",
+      "Content-Type" => "application/json",
       "Authorization" => "LINKHUB " + @_linkID + " " + hmac,
       "Accept-Encoding" => "gzip,deflate",
       "x-lh-date" => apiServerTime,
       "x-lh-version" => LINKHUB_APIVersion
     }
 
-    https = Net::HTTP.new(uri.host, 443)
-    https.use_ssl = true
-    Net::HTTP::Post.new(uri)
+    if forwardip != ""
+      headers.store("x-lh-forwarded", forwardip)
+    end
 
+    https = Net::HTTP.new(uri.host, uri.port)
+    https.use_ssl = true
     res = https.post(uri.path, postData, headers)
 
+    begin
+      gz = Zlib::GzipReader.new(StringIO.new(res.body.to_s))
+      uncompressed_string = gz.read
+    rescue Zlib::Error => le
+      uncompressed_string = res.body
+    end
+
     if res.code == "200"
-      if res.header['Content-Encoding'].eql?('gzip')
-        JSON.parse(gzip_parse(res.body))
-      else
-        JSON.parse(res.body)
-      end
+      JSON.parse(uncompressed_string)
     else
-      if res.header['Content-Encoding'].eql?('gzip')
-        code = JSON.parse(gzip_parse(res.body))["code"]
-        message = JSON.parse(gzip_parse(res.body))["message"]
-      else
-        code = JSON.parse(res.body)["code"]
-        message = JSON.parse(res.body)["message"]
-      end
-        raise LinkhubException.new(code,message)
+      raise LinkhubException.new(JSON.parse(uncompressed_string)["code"],
+        JSON.parse(uncompressed_string)["message"])
     end
   end # end of getToken
 
@@ -109,20 +110,10 @@ class Linkhub
     res = https.get(uri.request_uri, headers)
 
     if res.code == "200"
-      if res.header['Content-Encoding'].eql?('gzip')
-        JSON.parse(gzip_parse(res.body))["url"]
-      else
-        JSON.parse(res.body)["url"]
-      end
+      JSON.parse(res.body)["url"]
     else
-      if res.header['Content-Encoding'].eql?('gzip')
-        code = JSON.parse(gzip_parse(res.body))["code"]
-        message = JSON.parse(gzip_parse(res.body))["message"]
-      else
-        code = JSON.parse(res.body)["code"]
-        message = JSON.parse(res.body)["message"]
-      end
-        raise LinkhubException.new(code,message)
+      raise LinkhubException.new(JSON.parse(res.body)["code"],
+        JSON.parse(res.body)["message"])
     end
   end
 
@@ -141,20 +132,10 @@ class Linkhub
     res = https.get(uri.path, headers)
 
     if res.code == "200"
-      if res.header['Content-Encoding'].eql?('gzip')
-        JSON.parse(gzip_parse(res.body))["remainPoint"]
-      else
-        JSON.parse(res.body)["remainPoint"]
-      end
+      JSON.parse(res.body)["remainPoint"]
     else
-      if res.header['Content-Encoding'].eql?('gzip')
-        code = JSON.parse(gzip_parse(res.body))["code"]
-        message = JSON.parse(gzip_parse(res.body))["message"]
-      else
-        code = JSON.parse(res.body)["code"]
-        message = JSON.parse(res.body)["message"]
-      end
-        raise LinkhubException.new(code,message)
+      raise LinkhubException.new(JSON.parse(res.body)["code"],
+        JSON.parse(res.body)["message"])
     end
   end
 
@@ -173,21 +154,10 @@ class Linkhub
     res = https.get(uri.path, headers)
 
     if res.code == "200"
-
-      if res.header['Content-Encoding'].eql?('gzip')
-        JSON.parse(gzip_parse(res.body))["remainPoint"]
-      else
-        JSON.parse(res.body)["remainPoint"]
-      end
+      JSON.parse(res.body)["remainPoint"]
     else
-      if res.header['Content-Encoding'].eql?('gzip')
-        code = JSON.parse(gzip_parse(res.body))["code"]
-        message = JSON.parse(gzip_parse(res.body))["message"]
-      else
-        code = JSON.parse(res.body)["code"]
-        message = JSON.parse(res.body)["message"]
-      end
-        raise LinkhubException.new(code,message)
+      raise LinkhubException.new(JSON.parse(res.body)["code"],
+        JSON.parse(res.body)["message"])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkhub
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Linkhub Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Linkhub API SDK
 email: code@linkhub.co.kr
@@ -27,17 +27,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Linkhub API SDK