kamiliff 0.24.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3189c0303b55fd1e7d8ed2cc55f613544f8bdd9db48f34cf526baec151044afe
-  data.tar.gz: 5204d91c73e59aec7386a07f1f25d7ef4f1a5b6d9f5eb81d032faf91ac0e94cb
+  metadata.gz: ab005f01ac6af835748c47ef0c94a5036f7da0d0ed2e250750adaee470f7cf4d
+  data.tar.gz: deba6685fa6388fc17b0b97ee26a0980ddd686b55b180c56b9a93527b27cde36
 SHA512:
-  metadata.gz: ba41019d9be741d925eacf2451a16e3d4486a7404f2a2ed696eaed173b4f99f32bf235d4360331213113ba4a84a8de4ebccd7e98847d7f0673b302313c67bd2a
-  data.tar.gz: 226c181fd2fb67213dd105c984a1d251ccf58a3eb33645f2b0bdda5092c280810d91c9e09cd8e51dcb310f547d9cd48c2dc957a5471e152673334857abe81a6d
+  metadata.gz: c84c268fcad2335741d7fb4e0c80bcc7997d895ceda2b81263f72932900ac679211e5ab1407746b63aca9545947657c0f249dbe2f4426ea9e0839f9a70860e52
+  data.tar.gz: 9d2be0ac73c44d9ae24608d12eab10351d8ce7c4dd413e46f45962637b832691513154cf842a32bf2f2f6ead904e8df9567da64e65927c2badf8a01dfe102bd4

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/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.0'
+  VERSION = '0.28.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.28.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,7 +46,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('/','_')[0..-4]
-  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