focas-client 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f4c2dd2a7ee103cb94df29d1a5533b61c54cbbe8fa647b9adec894fe7f5c1f1
-  data.tar.gz: 0ded5275be6dc6d829d6e1f419cc6fd8d1cc6760e483d043f4f10c39e2f4e313
+  metadata.gz: 11c68d05214acea7703f3cff2606620e97d69ccccb3eb7388b7aa67a9433362b
+  data.tar.gz: 26268e6e37ddf84838731d261833326b7e302c36f773aca886d18650d070d4a0
 SHA512:
-  metadata.gz: 101f07e62ccb8deaff3d828c3ace67c5c74f0cb999a621f001a0d13023e6675bc1de301a43e2e82ff089ccaf20e14debd34b2d2ca254d054ff68668fb7454b33
-  data.tar.gz: eebd858ae046191478d553db46e455c4b1bdd98358564c08328cd18d59c93a42569099953f5c85e48f8bb6315de3809b53e1ea0f201071ae65a5422e97851972
+  metadata.gz: 3e0a77e689ada7cdeb6c84d7230bf9707a74f640880c6ebd078b0f509bec1f8fdc9d1837734fea1159c26dd847ce090cb4115c1e8c5d03ab84b7a3f7ded14175
+  data.tar.gz: 739e18dedc19d9730149ccf1448a3db0abec7a5414242e521b4466dcc961caa9b58e28a4c668b61297b825d8ca71cdff3d7ac226449983f2c2974d2418fa378d

data/CHANGELOG.md

@@ -1 +1 @@
-## 0.1.6 (開發中)
+## 0.1.8 (開發中)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    focas-client (0.1.6)
+    focas-client (0.1.8)
       activesupport (>= 4.0)
 
 GEM

data/lib/focas/config.rb

@@ -100,5 +100,55 @@ module Focas
     def create_lidm
       lidm = "#{Time.now.strftime("%Y%m%d%H%M%S")}_#{SecureRandom.hex(2).upcase}"
     end
+
+    def check_resp_token(data)
+      # 資料錯誤的先 return
+      return false if not data
+
+      ret = data.transform_keys(&:to_sym)
+      return false if not ret[:respToken]
+
+      begin
+        # to hash
+        resp_token = ret[:respToken]
+
+        options = Config.options
+        settings = options.transform_keys(&:to_sym)
+
+        # 檢查 ret[:status] 成功或失敗
+        if ret[:status] == '0'
+          # 成功
+          tmp_arr = %W(
+          #{ret[:status]}
+          #{ret[:lidm]}
+          #{settings[:token]}
+          #{ret[:authCode]}
+          #{ret[:authRespTime]}
+          #{settings[:MerchantID]}
+          #{settings[:TerminalID]}
+          )
+
+          hash_string = tmp_arr.join('&')
+        else
+          # 失敗
+          tmp_arr = %W(
+          #{ret[:status]}
+          #{ret[:errcode]}
+          #{ret[:lidm]}
+          #{settings[:token]}
+          #{ret[:authRespTime]}
+          #{settings[:MerchantID]}
+          #{settings[:TerminalID]}
+          )
+        end
+
+        # 開始驗證 token
+        hash_token = Digest::SHA256.hexdigest(hash_string).upcase
+        return (resp_token.upcase == hash_token)
+      rescue
+        return false
+      end
+    end
+
   end
 end

data/lib/focas/payment.rb

@@ -46,75 +46,23 @@ module Focas
       @response['Status'] == 'SUCCESS'
     end
 
-    def check_resp_token(data)
-      # 資料錯誤的先 return
-      return false if not data.present?
-
-      ret = data.transform_keys(&:to_sym).to_h
-      return false if not ret[:respToken].present?
-
-
-      begin
-        # to hash
-        resp_token = ret[:respToken]
-
-        options = Config.options
-        settings = options.transform_keys(&:to_sym).to_h
-
-        # 檢查 ret[:status] 成功或失敗
-        if ret[:status] == '0'
-          # 成功
-          tmp_arr = %W(
-          #{ret[:status]}
-          #{ret[:lidm]}
-          #{settings[:token]}
-          #{ret[:authCode]}
-          #{ret[:authRespTime]}
-          #{settings[:merchant_id]}
-          #{settings[:terminal_id]}
-          )
-
-          hash_string = tmp_arr.join('&')
-        else
-          # 失敗
-          tmp_arr = %W(
-          #{ret[:status]}
-          #{ret[:errcode]}
-          #{ret[:lidm]}
-          #{settings[:token]}
-          #{ret[:authRespTime]}
-          #{settings[:merchant_id]}
-          #{settings[:terminal_id]}
-          )
-        end
-
-        # 開始驗證 token
-        hash_token = Digest::SHA256.hexdigest(hash_string).upcase
-        return (resp_token.upcase == hash_token)
-      rescue
-        return false
-      end
-    end
-
     private
 
     def set_trade_info
       options = Config.options
-      @trade_info = options.transform_keys(&:to_sym).to_h
-      # 應移除 token，不該曝光
-      @trade_info.delete(:token)
+      @trade_info = options.transform_keys(&:to_sym)
 
       local_date = Time.now.strftime('%Y%m%d')
       local_time = Time.now.strftime('%H%M%S')
       trade_time = "#{local_date}#{local_time}"
-
+        
       # 訂單編號&交易金額&驗證參數&特店代號&端末代號&交易時間
       tmp_arr = %W(
         #{@lidm}
         #{@purch_amt}
-        #{options[:token]}
-        #{options[:merchant_id]}
-        #{options[:terminal_id]}
+        #{@trade_info[:token]}
+        #{@trade_info[:MerchantID]}
+        #{@trade_info[:TerminalID]}
         #{trade_time}
       )
 
@@ -133,10 +81,8 @@ module Focas
         LocalTime: local_time
       }
 
-      individual_trade_info.merge!(options[:trade_info]) if options[:trade_info]
-
-      # 同是 hash 再來 merge
-      @trade_info = (options.to_h.merge!(individual_trade_info)).transform_keys(&:to_sym)
+      # 應移除 token，不該曝光
+      @trade_info.merge!(individual_trade_info).delete(:token)
     end
   end
 end

data/lib/focas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Focas
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: focas-client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Daniel Lin (pct)