kamiliff 0.19.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 498ccd4075fc6cdf241d6ec11ecc943a1d5a18799677baf5a4b665585eca0658
-  data.tar.gz: ce48f53be68d877bb2efacc71eb264e8d6d74a499287bd9b1ba478bc10e12ea9
+  metadata.gz: 3189c0303b55fd1e7d8ed2cc55f613544f8bdd9db48f34cf526baec151044afe
+  data.tar.gz: 5204d91c73e59aec7386a07f1f25d7ef4f1a5b6d9f5eb81d032faf91ac0e94cb
 SHA512:
-  metadata.gz: ecd86a4de7d7e18be3a9ba5049ab36bdee3ebfa246ce07225a632d6739d86758dd71dc4e6aaa072110d750653029adc341e1c1bec06450e4c12eef0c14f7975e
-  data.tar.gz: 1538d204048373fa00fc63e9f8046039b2e8312ad48525d6505d3155fa381871339ad76d61c43dfe1088e06201c121e4cd15e38ec33491aaea0f56a814b98566
+  metadata.gz: ba41019d9be741d925eacf2451a16e3d4486a7404f2a2ed696eaed173b4f99f32bf235d4360331213113ba4a84a8de4ebccd7e98847d7f0673b302313c67bd2a
+  data.tar.gz: 226c181fd2fb67213dd105c984a1d251ccf58a3eb33645f2b0bdda5092c280810d91c9e09cd8e51dcb310f547d9cd48c2dc957a5471e152673334857abe81a6d

data/README.md

@@ -41,6 +41,8 @@ Since the compact size is default. You could only create the compact one.
 
 **NOTICE:** As LINE announcement, due to a function enhancement with LIFF v2, you should add LIFF apps to LINE Login channel. The LIFF apps added to Messaging API channels are still allowed to use.
 
+For the [Behaviors from accessing the LIFF URL to opening the LIFF app](https://developers.line.biz/en/docs/liff/opening-liff-app/#redirect-flow) setting, please use the Concatenate mode. That's the default value in the Kamiliff. If you want to use the Replace mode([will be removed on March 1, 2021](https://developers.line.biz/en/news/2020/11/20/discontinue-replace-mode-announcement/)), you can add an enviroment variable `LIFF_MODE` and set the value to `replace`.
+
 ### Set environment variables
 Create a file `.env` with the following content under the root directory. Kamiliff provides two setting ways, you can choose the one based on the position where LIFF apps added.
 

data/app/controllers/liff_controller.rb

@@ -8,16 +8,24 @@ class LiffController < ActionController::Base
     # fix liff 2.0 redirect issue
     @need_reload = query["liff.state"].present?
     if(@need_reload)
-      querystring = query["liff.state"][(query["liff.state"].index('?')+1)..-1]
-      query = Rack::Utils.parse_nested_query(querystring)
+      if query["liff.state"].index('?').present?
+        querystring = query["liff.state"][(query["liff.state"].index('?')+1)..-1]
+        query = Rack::Utils.parse_nested_query(querystring)
+      end
     end
 
-    @liff = LiffService.new(query)
+    # try base64 decode
+    if params[:base64].present?
+      @liff = LiffBase64Service.from_base64(params[:base64])
+    else
+      @liff = LiffService.new(query)
+    end
   end
 
   def route
-    path = params["path"]
-    @body = reserve_route(path, request_params: source_info, format: :liff)
+    path, query = params["path"].split("?")
+    query = Rack::Utils.parse_nested_query(query)
+    @body = reserve_route(path, 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/layouts/liff.html.erb

@@ -23,7 +23,6 @@
 
     <% unless has_jquery %>
       <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
-      <script> alert("has no jquery") </script>
     <% end %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>

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,
+      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

data/lib/kamiliff/services/liff_service.rb

@@ -20,7 +20,7 @@ class LiffService
     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.empty?
+    raise "LIFF_#{size} should be in the env variables" if url.blank?
     self.id = url[(url.rindex('/')+1)..-1]
   end
 end

data/lib/kamiliff/version.rb

@@ -1,3 +1,3 @@
 module Kamiliff
-  VERSION = '0.19.0'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.24.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2021-01-22 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