kamiliff 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3933c1a48a8b3bb9e4183e265af686ad270789d6012f927d19c54fa4be23f834
-  data.tar.gz: 53418c89721917f2cdc97eb43436edf6be8cf4128298c97b55397d78c1df69ce
+  metadata.gz: 8e1a6426cb9312e84ac551da647721c6a63c4def94bbda616618e219a1bf5b61
+  data.tar.gz: 1290e1aa4a8fba4c814836992b1271cc722fbc4017298584971d7eb72f7ab565
 SHA512:
-  metadata.gz: 3939f22ba9d727197e37c8e579791bc515f519dca6b206579965264d463108682768b4336da6c9ec2ec46b5c7f6b97899c28fe96dce5a00cb49768275973ce76
-  data.tar.gz: af3c5a49dc6445f6278394ae8db02cb9dc0abe5541383ed91f538af9a284875809fac6a0e05d68510ae3869715ae00f088693b0a79bc8d6337028160994f5a26
+  metadata.gz: c1dae23952d71fc92ce40301baf1d8a4b1b40681c3545333d2f024aec282466730c0b762181dbb9bb57c28034ecf0682e19791f5a00bb37705daa98a2e1f0a0a
+  data.tar.gz: 570d689c3734d11b6adc4ddc67323f0e190fc710be3c2cba95029351e776da307c7bcd1a1dc14eeb6802db75ef8e8e35b56ef997491b8c8f017d1fa6358c8e62

data/app/controllers/liff_controller.rb

@@ -2,16 +2,17 @@
 class LiffController < ApplicationController
   layout false, only: :route
 
-
   def entry
     query = Rack::Utils.parse_nested_query(request.query_string)
 
-    # fix liff 2.0 path issue
-    if query["liff.state"].present?
-      query = Rack::Utils.parse_nested_query(query["liff.state"][1..-1])
+    # 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)
     end
 
-    @path = query["path"]
+    @liff = LiffService.new(query)
   end
 
   def route
@@ -32,7 +33,7 @@ class LiffController < ApplicationController
 
     res = Rails.application.routes.router.serve(request)
     res[2].body
-  rescue
+  rescue Exception => e
     res[2].to_s
   end
 

data/app/helpers/liff_helper.rb

@@ -1,9 +1,6 @@
 module LiffHelper
   def liff_path(params)
-    liff_size = params[:liff_size] || :compact
-    liff_size = liff_size.to_s.upcase
-    raise "liff_size should be compact, tall or full." unless liff_size.in? %w[COMPACT TALL FULL]
-    liff_url = ENV["LIFF_#{liff_size}"]
-    "#{liff_url}?#{params.to_query}"
+    liff = LiffService.new(params)
+    "#{liff.url}/liff_entry?#{params.to_query}"
   end
 end

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

@@ -5,7 +5,7 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <meta name="viewport" content="width=device-width, initial-scale=1" >
-    <script src="https://d.line-scdn.net/liff/1.0/sdk.js"></script>
+    <script src="https://static.line-scdn.net/liff/edge/2.1/sdk.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>

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

@@ -42,15 +42,24 @@
     });
   }
 
-  liff.init(
-    data => {
-      data.path = '<%= @path %>';
-      route(data);
-    },
-    err => {
-      alert("Please open this url in Line.");
+  liff.init({
+    liffId: "<%= @liff.id %>"
+  })
+  .then(() => {
+    if (!liff.isLoggedIn()) {
+      liff.login();
+    }else{
+      const data = {};
+      data.context = liff.getContext();
+      data.path = "<%= @liff.path %>";
+      <% if !@need_reload %>
+        route(data);
+      <% end %>
     }
-  );
+  })
+  .catch((err) => {
+    console.log(err.code, err.message);
+  });
 })();
 </script>
 <% end %>

data/lib/kamiliff.rb

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

data/lib/kamiliff/services/liff_service.rb

@@ -0,0 +1,26 @@
+class LiffService
+
+  # 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 initialize(options)
+    self.path = options[:path] || options['path'] || "/"
+    self.size = options[:liff_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.empty?
+    self.id = url[(url.rindex('/')+1)..-1]
+  end
+end

data/lib/kamiliff/version.rb

@@ -1,3 +1,3 @@
 module Kamiliff
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-03 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_service.rb
 - lib/kamiliff/version.rb
 - lib/tasks/kamiliff_tasks.rake
 homepage: https://github.com/etrex/kamiliff