kamiliff 0.23.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d9f1e36c1dc706651145146649792d8f128784824c476d688e1b7c42b0e6ba
-  data.tar.gz: 2bc4437b67d94a0bb39456d470a615d63363aadf43bb1fbf6301659fc80e982e
+  metadata.gz: 38aca00ff3bcedc33c8e81f3c2067db8aeba06020701d93b03e8c6927b12267e
+  data.tar.gz: 7a5eeece3bc9a2530d568b9b50c99e8fd39e77b4f48ee79a59e85b1cf07811d6
 SHA512:
-  metadata.gz: 7debaefba5c60a6327e74db069680dbcd4462a42c1ad31a10ea28456651302032e7c6c4c8a9a625509ee095731a8292f6e6424a63b629065483e769215607d71
-  data.tar.gz: ce34f047195fe836f37f3da058902aef6218448efacc0c0bf5e1d11235e9b0e6d57a3d16d02ba95f462e51af1c83d782a9240411cae49eea95863a881ada2172
+  metadata.gz: fcded347d34ad824c20dc0e481d46e5ee376140f049a7d3fe603d6ea71dd9662bcfe9d09bd4d9cb2d3a2ad384f8503f4bfaeb22529a5a040a09e570bc99410a0
+  data.tar.gz: 71bbd81ebc6963ddd9dca6244803e62c4bbbce31ec4479b7f7fa3d948c8fa2ce7e397ebc225d10f832d6ee3ba6f744c2c7e45d900143f6885db17ab89bb32b4e

data/app/controllers/liff_controller.rb

@@ -7,18 +7,31 @@ class LiffController < ActionController::Base
 
     # fix liff 2.0 redirect issue
     @need_reload = query["liff.state"].present?
+
+    # 第一次 redirect
     if(@need_reload)
-      querystring = query["liff.state"][(query["liff.state"].index('?')+1)..-1]
-      query = Rack::Utils.parse_nested_query(querystring)
+      if(query["liff.state"][0] == '/')
+        @liff = LiffBase64Service.from_base64(query["liff.state"][1..-1])
+      else
+        querystring = query["liff.state"][(query["liff.state"].index('?')+1)..-1]
+        query = Rack::Utils.parse_nested_query(querystring)
+        @liff = LiffService.new(query)
+      end
+    # 第二次 redirect
+    else
+      if params[:base64].present?
+        @liff = LiffBase64Service.from_base64(params[:base64])
+      else
+        @liff = LiffService.new(query)
+      end
     end
-
-    @liff = LiffService.new(query)
   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)
+    http_method = query["_method"]&.upcase || "GET"
+    @body = reserve_route(path, http_method: http_method, request_params: source_info.merge(query), format: :liff)
   end
 
   private

data/app/helpers/liff_helper.rb

@@ -1,5 +1,5 @@
 module LiffHelper
-  def liff_path(params)
+  def old_liff_path(params)
     liff = LiffService.new(params)
     if ENV["LIFF_MODE"]&.downcase == "replace"
       return "#{liff.url}/liff_entry?#{params.to_query}"
@@ -7,4 +7,9 @@ module LiffHelper
     # liff mode is Concatenate
     "#{liff.url}?#{params.to_query}"
   end
+
+  def liff_path(params)
+    liff = LiffBase64Service.new(params)
+    liff.full_url
+  end
 end

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/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   # liff
+  get 'liff_entry/:base64', to: 'liff#entry'
   get 'liff_entry', to: 'liff#entry'
   post 'liff_route', to: 'liff#route'
 end

data/lib/kamiliff.rb

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

data/lib/kamiliff/services/liff_base64_service.rb

@@ -0,0 +1,52 @@
+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,
+      liff_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

data/lib/kamiliff/version.rb

@@ -1,3 +1,3 @@
 module Kamiliff
-  VERSION = '0.23.0'
+  VERSION = '0.27.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.27.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,6 +46,7 @@ files:
 - config/routes.rb
 - lib/kamiliff.rb
 - lib/kamiliff/engine.rb
+- lib/kamiliff/services/liff_base64_service.rb
 - lib/kamiliff/services/liff_service.rb
 - lib/kamiliff/version.rb
 - lib/tasks/kamiliff_tasks.rake