weixin_authorize 1.6.0 → 1.6.2

data/lib/weixin_authorize/config.rb

@@ -9,12 +9,21 @@ module WeixinAuthorize
     end
 
     def weixin_redis
-      return nil if WeixinAuthorize.config.nil?
-      @redis ||= WeixinAuthorize.config.redis
+      return nil if config.nil?
+      @redis ||= config.redis
+    end
+
+    # 可选配置: RestClient timeout, etc.
+    # key 必须是符号
+    def rest_client_options
+      if config.nil?
+        return {timeout: 5, open_timeout: 5, verify_ssl: true}
+      end
+      config.rest_client_options
     end
   end
 
   class Config
-    attr_accessor :redis
+    attr_accessor :redis, :rest_client_options
   end
 end

data/lib/weixin_authorize/handler/result_handler.rb

@@ -39,6 +39,7 @@ module WeixinAuthorize
       # result.result[:ok] #=> true
       # result.result['ok'] #=> true
       def package_result(result)
+        return result if !result.is_a?(Hash)
         if defined?(Rails)
           ActiveSupport::HashWithIndifferentAccess.new(result)
         else

data/lib/weixin_authorize/js_ticket/object_store.rb

@@ -0,0 +1,21 @@
+module WeixinAuthorize
+  module JsTicket
+    class ObjectStore < Store
+
+      def jsticket_expired?
+        # 如果当前token过期时间小于现在的时间，则重新获取一次
+        client.jsticket_expired_at <= Time.now.to_i
+      end
+
+      def jsticket
+        super
+        client.jsticket
+      end
+
+      def refresh_jsticket
+        super
+      end
+
+    end
+  end
+end

data/lib/weixin_authorize/js_ticket/redis_store.rb

@@ -0,0 +1,41 @@
+module WeixinAuthorize
+  module JsTicket
+    class RedisStore < Store
+      JSTICKET = "jsticket"
+      EXPIRED_AT = "expired_at"
+
+      def jsticket_expired?
+        weixin_redis.hvals(client.jsticket_redis_key).empty?
+      end
+
+      def refresh_jsticket
+        super
+        weixin_redis.hmset(
+          client.jsticket_redis_key,
+          JSTICKET,
+          client.jsticket,
+          EXPIRED_AT,
+          client.jsticket_expired_at
+        )
+        weixin_redis.expireat(
+          client.jsticket_redis_key,
+          client.jsticket_expired_at.to_i
+        )
+      end
+
+      def jsticket
+        super
+        client.jsticket = weixin_redis.hget(client.jsticket_redis_key, JSTICKET)
+        client.jsticket_expired_at = weixin_redis.hget(
+          client.jsticket_redis_key,
+          EXPIRED_AT
+        )
+        client.jsticket
+      end
+
+      def weixin_redis
+        WeixinAuthorize.weixin_redis
+      end
+    end
+  end
+end

data/lib/weixin_authorize/js_ticket/store.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module WeixinAuthorize
+  module JsTicket
+    class Store
+
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      def self.init_with(client)
+        if WeixinAuthorize.weixin_redis.nil?
+          ObjectStore.new(client)
+        else
+          RedisStore.new(client)
+        end
+      end
+
+      def jsticket_expired?
+        raise NotImplementedError, "Subclasses must implement a jsticket_expired? method"
+      end
+
+      def refresh_jsticket
+        set_jsticket
+      end
+
+      def jsticket
+        refresh_jsticket if jsticket_expired?
+      end
+
+      def set_jsticket
+        result = client.http_get("/ticket/getticket", {type: 1}).result
+        client.jsticket = result["ticket"]
+        client.jsticket_expired_at = result["expires_in"] + Time.now.to_i
+      end
+
+    end
+  end
+end

data/lib/weixin_authorize/token/object_store.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+module WeixinAuthorize
+  module Token
+    class ObjectStore < Store
+
+      def valid?
+        super
+      end
+
+      def token_expired?
+        # 如果当前token过期时间小于现在的时间，则重新获取一次
+        client.expired_at <= Time.now.to_i
+      end
+
+      def refresh_token
+        super
+      end
+
+      def access_token
+        super
+        client.access_token
+      end
+    end
+  end
+end

data/lib/weixin_authorize/token/redis_store.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+module WeixinAuthorize
+  module Token
+    class RedisStore < Store
+
+      def valid?
+       weixin_redis.del(client.redis_key)
+       super
+      end
+
+      def token_expired?
+        weixin_redis.hvals(client.redis_key).empty?
+      end
+
+      def refresh_token
+        super
+        weixin_redis.hmset(client.redis_key, "access_token", client.access_token,
+                                             "expired_at",   client.expired_at)
+        weixin_redis.expireat(client.redis_key, client.expired_at.to_i-10) # 提前10秒超时
+      end
+
+      def access_token
+        super
+        client.access_token = weixin_redis.hget(client.redis_key, "access_token")
+        client.expired_at   = weixin_redis.hget(client.redis_key, "expired_at")
+        client.access_token
+      end
+
+      def weixin_redis
+        WeixinAuthorize.weixin_redis
+      end
+    end
+  end
+
+end

data/lib/weixin_authorize/token/store.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+module WeixinAuthorize
+  module Token
+    class Store
+
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      def self.init_with(client)
+        if WeixinAuthorize.weixin_redis.nil?
+          ObjectStore.new(client)
+        else
+          RedisStore.new(client)
+        end
+      end
+
+      def valid?
+        authenticate["valid"]
+      end
+
+      def authenticate
+        auth_result = http_get_access_token
+        auth = false
+        if auth_result.is_ok?
+          set_access_token(auth_result.result)
+          auth = true
+        end
+        {"valid" => auth, "handler" => auth_result}
+      end
+
+      def refresh_token
+        handle_valid_exception
+        set_access_token
+      end
+
+      def access_token
+        refresh_token if token_expired?
+      end
+
+      def token_expired?
+        raise NotImplementedError, "Subclasses must implement a token_expired? method"
+      end
+
+      def set_access_token(access_token_infos=nil)
+        token_infos = access_token_infos || http_get_access_token.result
+        client.access_token = token_infos["access_token"]
+        client.expired_at   = Time.now.to_i + token_infos["expires_in"].to_i
+      end
+
+      def http_get_access_token
+        WeixinAuthorize.http_get_without_token("/token", authenticate_headers)
+      end
+
+      def authenticate_headers
+        {grant_type: GRANT_TYPE, appid: client.app_id, secret: client.app_secret}
+      end
+
+      private
+
+        def handle_valid_exception
+          auth_result = authenticate
+          if !auth_result["valid"]
+            result_handler = auth_result["handler"]
+            raise ValidAccessTokenException, result_handler.full_error_message
+          end
+        end
+    end
+  end
+end

data/lib/weixin_authorize/version.rb

@@ -1,3 +1,3 @@
 module WeixinAuthorize
-  VERSION = "1.6.0"
+  VERSION = "1.6.2"
 end

data/spec/1_fetch_access_token_spec.rb

@@ -1,5 +1,4 @@
 # NOTE: the rspec should be test alonely.
-require "spec_helper"
 describe WeixinAuthorize::Client do
   describe "#get access_token" do
     it "return a access_token nil value before authenticate" do

data/spec/2_fetch_jsticket_spec.rb

@@ -0,0 +1,10 @@
+describe WeixinAuthorize::Client do
+  describe "#get jsticket" do
+    it "return the same jsticket in the same thing twice" do
+      js_ticket_1 = $client.get_jsticket
+      sleep 5
+      js_ticket_2 = $client.get_jsticket
+      expect(js_ticket_1).to eq(js_ticket_2)
+    end
+  end
+end

data/spec/api/custom_spec.rb

@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe WeixinAuthorize::Api::Custom do
   let(:text_message) do
     "text Custom message"

data/spec/api/groups_spec.rb

@@ -1,4 +1,3 @@
-require "spec_helper"
 describe WeixinAuthorize::Api::Groups do
 
   let(:group_name) do

data/spec/api/mass_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe WeixinAuthorize::Api::Mass do
+
+  let(:image_jpg_path) do
+    "#{File.dirname(__FILE__)}/medias/ruby-logo.jpg"
+  end
+
+  let(:news_media_1) do
+    {
+      "thumb_media_id" => "",
+      "author" => "lanrion",
+      "title"  => "Happy Day",
+      "content_source_url" => "www.qq.com",
+      "content" => "content",
+      "digest"  => "digest"
+    }
+  end
+
+  let(:image_media_id) do
+    # Get image media_id
+    image_media = $client.upload_media(image_jpg_path, "image")
+    media_id    = image_media.result["media_id"]
+    media_id
+  end
+
+  let(:mass_media_id) do
+    media       = {"thumb_media_id" => image_media_id}
+    news_media  = news_media_1.merge(media)
+
+    # upload news media
+    response = $client.upload_mass_news([news_media])
+    mass_media_id = response.result["media_id"]
+    mass_media_id
+  end
+
+  it "#upload_mass_news" do
+    media       = {"thumb_media_id" => image_media_id}
+    news_media  = news_media_1.merge(media)
+
+    # upload news media
+    response = $client.upload_mass_news([news_media])
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["type", "media_id", "created_at"])
+  end
+
+  it "#mass_with_group with mpnews" do
+    response = $client.mass_with_group("1", "mass_group_text", "text")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+  end
+
+  it "#mass_with_openids with mpnews and can delete message" do
+    response = $client.mass_with_openids([ENV["OPENID"]], mass_media_id)
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+    expect(response.result.keys).to eq(["msg_id"])
+    delete_res = $client.mass_delete_with_msgid(response.result["msg_id"])
+    expect(delete_res.code).to eq(WeixinAuthorize::OK_CODE)
+  end
+
+  it "#mass_preview can preview by openid" do
+    response = $client.mass_preview(ENV["OPENID"], "mass_text", "text")
+    expect(response.code).to eq(WeixinAuthorize::OK_CODE)
+  end
+
+end

data/spec/api/media_spec.rb

@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe WeixinAuthorize::Api::Media do
 
   let(:image_jpg_path) do
@@ -19,7 +17,7 @@ describe WeixinAuthorize::Api::Media do
   end
 
   let(:remote_png_path) do
-    "http://l.ruby-china.org/user/large_avatar/273.png"
+    "https://ruby-china-files.b0.upaiyun.com/user/big_avatar/273.jpg"
   end
 
   let(:remote_jpg_path) do

data/spec/api/menu_spec.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require "spec_helper"
-
 describe WeixinAuthorize::Api::Menu do
 
   it "can create a menu" do

data/spec/api/qrcode_spec.rb

@@ -1,20 +1,18 @@
-require "spec_helper"
-
 describe WeixinAuthorize::Api::Qrcode do
 
   it "#create_qr_scene" do
     response = $client.create_qr_scene("123")
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
-    expect(response.result.keys).to eq(["ticket", "expire_seconds"])
+    expect(response.result.keys).to eq(["ticket", "expire_seconds", "url"])
     expect(response.result["expire_seconds"]).to eq(1800)
   end
 
   it "#create_qr_limit_scene" do
     response = $client.create_qr_limit_scene("1234")
     expect(response.code).to eq(WeixinAuthorize::OK_CODE)
-    expect(response.result.keys).to eq(["ticket"])
+    expect(response.result.keys).to eq(["ticket", "url"])
   end
-  
+
   it "#return_qr_url" do
     response = $client.create_qr_limit_scene("1234")
     qr_url = $client.qr_code_url(response.result["ticket"])

data/spec/api/user_spec.rb

@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe WeixinAuthorize::Api::User do
   it "can get a weixin User info" do
     user_info = $client.user(ENV["OPENID"])
@@ -20,4 +18,9 @@ describe WeixinAuthorize::Api::User do
     expect(followers.code).to eq(WeixinAuthorize::OK_CODE)
     expect(followers.result.keys).to eq(["total", "count", "data", "next_openid"])
   end
+
+  it "can update user remark" do
+    user_info = $client.update_remark(ENV["OPENID"], "dylan")
+    expect(user_info.code).to eq(WeixinAuthorize::OK_CODE)
+  end
 end