kamiliff 0.24.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41f6d9fc6bfe8a13690ec161fbed9dac12cdbe36967a5a3c80dca4d7b16d4000
-  data.tar.gz: 532ad15c5e760ee8dc13409d9a5ee7907be83c25efcd948c64079468e34abff0
+  metadata.gz: a255c2f6b73407c86e8f993716595072c3dc1c8c8a655df0b626c13719eae8d0
+  data.tar.gz: 49b62ebd406218e682cb1fe2b68c7300695c53392cdce0938bc56fceb7c90e9a
 SHA512:
-  metadata.gz: 1e78a0aedee965fbea3dcb845b7ddaaf78cf01fa96c1cbd84c3fb2de8c07b5f1fe5f8e6b1062a971789b4489175634977f3b0cdfa1e2f20c4d167ac58190b23a
-  data.tar.gz: 3b14acd351d07c7ea43431c77c66925cfc26a1945c644ebed7f2bb4a401f05236df54d18b1ffdfc8cb541f8718e033576351204f9925536428987da7fb6794bd
+  metadata.gz: e9a989ee028a5e130b7ba041e79a57279510e39672411263c5087bb162603d8ccc04bf46f9ef03c7f0e11007f1b6707f2e9b208d6d031d4b53a50aa58e1d327b
+  data.tar.gz: '09fd775c392002cf34d7998ec020f779faa7a00fd977270056ac77ab786507cedc5187a6c2be1ebfe693389635a18fa5b815ef206af9791a72e5ff712533903f'

data/app/controllers/liff_controller.rb

@@ -1,35 +1,62 @@
 
 class LiffController < ActionController::Base
   layout false, only: :route
+  before_action :set_liff_param, only: [:entry]
 
   def entry
+    @liff = LiffService.new(@liff_param)
+  end
+
+  def route
+    path, query = params["path"].split("?")
+    query = Rack::Utils.parse_nested_query(query)
+    http_method = query["_method"]&.upcase || "GET"
+    @body = reserve_route(path, http_method: http_method, request_params: source_info.merge(query), format: :liff)
+  end
+
+  private
+
+  # {"path"=>"/orders", "liff_size"=>"TALL"}
+  def set_liff_param
     query = Rack::Utils.parse_nested_query(request.query_string)
 
     # fix liff 2.0 redirect issue
     @need_reload = query["liff.state"].present?
+
+    # 需要從 session 讀取 @liff_param
+    if query["liffRedirectUri"].present?
+      @liff_param = Base64DecodeService.new(session[:liff_param]).run
+      session[:liff_param] = nil
+      return
+    end
+
+    # 第一次 redirect
     if(@need_reload)
-      if query["liff.state"].index('?').present?
+      # base64 的情況
+      if(query["liff.state"][0] == '/')
+        base64_string = query["liff.state"][1..-1]
+        @liff_param = Base64DecodeService.new(base64_string).run
+      # query 的情況
+      else
         querystring = query["liff.state"][(query["liff.state"].index('?')+1)..-1]
-        query = Rack::Utils.parse_nested_query(querystring)
+        @liff_param = Rack::Utils.parse_nested_query(querystring)
       end
-    end
-
-    # try base64 decode
-    if params[:base64].present?
-      @liff = LiffBase64Service.from_base64(params[:base64])
+    # 第二次 redirect
     else
-      @liff = LiffService.new(query)
+      # base64 的情況
+      if params[:base64].present?
+        base64_string = params[:base64]
+        @liff_param = Base64DecodeService.new(base64_string).run
+      # query 的情況
+      else
+        @liff_param = query
+      end
     end
-  end
 
-  def route
-    path, query = params["path"].split("?")
-    query = Rack::Utils.parse_nested_query(query)
-    @body = reserve_route(path, request_params: source_info.merge(query), format: :liff)
+    # 保存最後一次 liff_param 到 session
+    session[:liff_param] = Base64EncodeService.new(@liff_param).run
   end
 
-  private
-
   def reserve_route(path, http_method: "GET", request_params: nil, format: nil)
     request.request_method = http_method
     request.path_info = path

data/app/helpers/liff_helper.rb

@@ -9,7 +9,7 @@ module LiffHelper
   end
 
   def liff_path(params)
-    liff = LiffBase64Service.new(params)
+    liff = LiffService.new(params)
     liff.full_url
   end
 end

data/app/views/liff/_share_target_picker.liff.erb

@@ -0,0 +1,31 @@
+<script>
+  (function(){
+    async function share_target_picker(messages){
+      /* JS 不支援的情況 */
+      if (!liff.isApiAvailable('shareTargetPicker')){
+        return;
+      }
+
+      /* 分享訊息給好友 */
+      const response = await liff.shareTargetPicker(messages);
+
+      /* 分享訊息失敗 */
+      if(!response){
+        const [majorVer, minorVer] = (liff.getLineVersion() || "").split('.');
+        if (parseInt(majorVer) == 10 && parseInt(minorVer) < 11) {
+          alert("你的 LINE 版本太舊，無法使用分享訊息功能。");
+        } else {
+          alert("你已取消分享訊息。");
+        }
+      }
+    }
+
+    async function send_messages(){
+      const messages = <%= raw messages %>;
+      await share_target_picker(messages);
+      liff.closeWindow();
+    }
+
+    send_messages();
+  })();
+</script>

data/app/views/liff/entry.html.erb

@@ -1,6 +1,6 @@
 <% content_for :js do %>
 <script>
-(function(){
+let open_liff_page = (function(){
   function append_csrf(data){
     var csrf_param = undefined;
     var csrf_token = undefined;
@@ -24,47 +24,52 @@
     $("#liff_body").html(body);
   }
 
-  function dispatch_ready_event(data){
+  function dispatch_liff_ready_event(){
     var event = new CustomEvent('liff_ready');
     window.dispatchEvent(event);
   }
 
-  function route(data){
+  async function liff_init(){
+    await liff.init({
+      liffId: "<%= @liff.id %>"
+    });
+    if (!liff.isLoggedIn()) {
+      liff.login();
+    }
+  }
+
+  async function get_liff_data(){
+    const profile = await liff.getProfile();
+    const context = liff.getContext();
+    return {
+      profile,
+      context
+    }
+  }
+
+  async function open_liff_page(path){
+    const data = await get_liff_data();
+    data.path = path;
     $.ajax({
       type: "POST",
       url: '/liff_route',
       data: append_csrf(data)
     }).done(function(html){
       render_body(html);
-      dispatch_ready_event();
+      dispatch_liff_ready_event();
     }).fail(function(e){
       alert("on error: " + JSON.stringify(e));
     });
   }
 
-  window.onload = function() {
-    liff.init({
-      liffId: "<%= @liff.id %>"
-    })
-    .then(() => {
-      if (!liff.isLoggedIn()) {
-        liff.login();
-      }else{
-        liff.getProfile().then(profile => {
-          const data = {};
-          data.context = liff.getContext();
-          data.profile = profile;
-          data.path = "<%= @liff.path %>";
-          <% if !@need_reload %>
-            route(data);
-          <% end %>
-        })
-      }
-    })
-    .catch((err) => {
-      console.log(err.code, err.message);
-    });
+  window.onload = async function() {
+    await liff_init();
+    <% if !@need_reload %>
+      await open_liff_page("<%= @liff.path %>");
+    <% end %>
   };
+
+  return open_liff_page;
 })();
 </script>
 <% end %>

data/lib/kamiliff.rb

@@ -1,6 +1,7 @@
 require "kamiliff/engine"
+require "kamiliff/services/base64_encode_service"
+require "kamiliff/services/base64_decode_service"
 require "kamiliff/services/liff_service"
-require "kamiliff/services/liff_base64_service"
 
 module Kamiliff
   # Your code goes here...

data/lib/kamiliff/services/base64_decode_service.rb

@@ -0,0 +1,15 @@
+require "base64"
+
+class Base64DecodeService
+
+  def initialize(base64_string)
+    @base64_string = base64_string
+  end
+
+  def run
+    json = Base64.decode64(@base64_string)
+    options = JSON.parse(json)
+    options.with_indifferent_access
+  end
+
+end

data/lib/kamiliff/services/base64_encode_service.rb

@@ -0,0 +1,15 @@
+require "base64"
+
+class Base64EncodeService
+
+  def initialize(options)
+    @options = options
+  end
+
+  def run
+    json = @options.to_json
+    base64_string = Base64.encode64(json)
+    base64_string.tr('+','-').tr('/','_').tr("\n", '').tr('=', '')
+  end
+
+end

data/lib/kamiliff/services/liff_service.rb

@@ -15,12 +15,22 @@ class LiffService
   attr_accessor :id
 
   def initialize(options)
-    self.path = options[:path] || options['path'] || "/"
-    self.size = options[:liff_size] || options['liff_size'] || :compact
+    self.path = options[:path] || "/"
+    self.size = options[:liff_size] || :compact
     self.size = size.to_s.upcase
     raise "liff_size should be compact, tall or full." unless size.in? %w[COMPACT TALL FULL]
     self.url = ENV["LIFF_#{size}"]
     raise "LIFF_#{size} should be in the env variables" if url.blank?
     self.id = url[(url.rindex('/')+1)..-1]
   end
+
+  def full_url
+    # liff mode is Concatenate
+    base64_string = Base64EncodeService.new({
+      path: path,
+      liff_size: size
+    }).run
+    "#{url}/#{base64_string}"
+  end
+
 end

data/lib/kamiliff/version.rb

@@ -1,3 +1,3 @@
 module Kamiliff
-  VERSION = '0.24.1'
+  VERSION = '0.29.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.29.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,6 +39,7 @@ files:
 - app/helpers/liff_helper.rb
 - app/views/layouts/application.liff.erb
 - app/views/layouts/liff.html.erb
+- app/views/liff/_share_target_picker.liff.erb
 - app/views/liff/entry.html.erb
 - app/views/liff/route.html.erb
 - config/initializers/assets.rb
@@ -46,7 +47,8 @@ files:
 - config/routes.rb
 - lib/kamiliff.rb
 - lib/kamiliff/engine.rb
-- lib/kamiliff/services/liff_base64_service.rb
+- lib/kamiliff/services/base64_decode_service.rb
+- lib/kamiliff/services/base64_encode_service.rb
 - lib/kamiliff/services/liff_service.rb
 - lib/kamiliff/version.rb
 - lib/tasks/kamiliff_tasks.rake

data/lib/kamiliff/services/liff_base64_service.rb

@@ -1,52 +0,0 @@
-require "base64"
-
-class LiffBase64Service
-
-  # rails routes path
-  attr_accessor :path
-
-  # size
-  # COMPACT TALL FULL
-  attr_accessor :size
-
-  # liff app url
-  # https://liff.line.me/app/#{liff_id}
-  attr_accessor :url
-
-  # liff id
-  attr_accessor :id
-
-  def self.from_base64(base64_string)
-    base64_string = base64_string.tr('-','+').tr('_','/')
-    json = Base64.decode64(base64_string)
-    options = JSON.parse(json)
-    LiffBase64Service.new(options)
-  end
-
-  def to_base64
-    json = {
-      path: path,
-      size: size
-    }.to_json
-    base64_string = Base64.encode64(json)
-    base64_string.tr('+','-').tr('/','_').tr("\n", '').tr('=', '')
-  end
-
-  def initialize(options)
-    options = options.with_indifferent_access
-    self.path = options[:path] || "/"
-    self.size = options[:liff_size] || :compact
-    self.size = size.to_s.upcase
-    raise "liff_size should be compact, tall or full." unless size.in? %w[COMPACT TALL FULL]
-    self.url = ENV["LIFF_#{size}"]
-    raise "LIFF_#{size} should be in the env variables" if url.blank?
-    self.id = url[(url.rindex('/')+1)..-1]
-  end
-
-  def full_url
-    if ENV["LIFF_MODE"]&.downcase == "replace"
-    end
-    # liff mode is Concatenate
-    "#{url}/#{to_base64}"
-  end
-end