kamiliff 0.31.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955111b68428e0cc0e93dbae9efb62e05c5fadcdff1ea4c54f18fa0cc8fd3bda
-  data.tar.gz: 72bcfbce267e8ffc9697eb4477dea346f7e3af54aaec07c83191823f37e12ae4
+  metadata.gz: 5cadd63601665e9929d92e4a388c7302da061204ac677151e3f31bd22f3ad5df
+  data.tar.gz: 062cdd8edc89cbf4b01b6d7cfd7308f19d31ea1364b5d7b2032dfe749a0104dc
 SHA512:
-  metadata.gz: 480280f31fc7637bb3a013d67c8255dc4e54b5bb6fe9fd6b92ba61cb6d6148d047e27c53ded5ab4a299cfb2cdb308196198716268fcb1809066fecd3081dfb77
-  data.tar.gz: 98e29a589edd018a0382072bd55d45e70189d6f3a7d4727828069deba66af7cd5e92329963841701feed672751c3c79144a9743cfda6bc00f2d3523785eb7e3b
+  metadata.gz: 04c61b4c8aea5c4b54cb788353d8c8ed46ff7d44e978088a723449327d4baf0ed53254c56d618fb0f233b84ee2df9c7b8570c6f2460815afdccf8ff21e0d4558
+  data.tar.gz: 64123903cf8a36641ffae41b9ca42f77d41034f1174f5822792ea77029ff13c31d76f43a08b4e4c587dd1928882c972233205cef6dd717859c42fc49886b7219

data/app/controllers/liff_controller.rb

@@ -23,7 +23,7 @@ class LiffController < ActionController::Base
     # fix liff 2.0 redirect issue
     @need_reload = query["liff.state"].present?
 
-    # 需要從 session 讀取 @liff_param
+    # 需要從 session 讀取 @liff_param (使用電腦開啟 LIFF 頁面，第一次登入時的情況)
     if query["liffRedirectUri"].present?
       @liff_param = Base64DecodeService.new(session[:liff_param]).run
       session[:liff_param] = nil
@@ -75,22 +75,74 @@ class LiffController < ActionController::Base
     res&.to_s || e.full_message
   end
 
+
+  # profile format
+  # {
+  #   "userId"=>"U1234567890abcdefghijklmnopqrstuv",
+  #   "displayName"=>"user name",
+  #   "statusMessage"=>"user status message",
+  #   "pictureUrl"=>"https://this.is.an.image.url"
+  # }
   def source_info
     context = params["context"]
-    return nil if context.nil?
-
-    source_type = context["type"].gsub("utou", "user")
-    source_group_id = context["roomId"] || context["groupId"] || context["userId"]
-    source_user_id = context["userId"]
+    return {
+      platform_type: 'line',
+      liff_error: 'context not found',
+    } if context.nil?
 
     profile = params["profile"]
+    return {
+      platform_type: 'line',
+      liff_error: 'profile not found',
+      context: context,
+    } if profile.nil?
+
+    # authorize the user id
+    decoded_id_token = get_decoded_id_token
+
+    return {
+      platform_type: 'line',
+      liff_error: 'id token not found',
+      context: context,
+      profile: profile,
+    } if params["idToken"].nil?
+
+    return {
+      platform_type: 'line',
+      liff_error: 'user id does not match',
+      context: context,
+      profile: profile,
+      decoded_id_token: decoded_id_token
+    } unless decoded_id_token["sub"] == context["userId"] && decoded_id_token["sub"] == profile["userId"]
+
+    source_type = context["type"].gsub("utou", "user")
+    source_group_id = context["roomId"] || context["groupId"] || decoded_id_token["sub"]
+    source_user_id = decoded_id_token["sub"]
 
     {
       platform_type: 'line',
       source_type: source_type,
       source_group_id: source_group_id,
       source_user_id: source_user_id,
-      profile: profile
+      context: context,
+      profile: profile,
+      decoded_id_token: decoded_id_token
     }
   end
+
+  # decoded_id_token is JWT format
+  # {
+  #  "iss"=>"https://access.line.me",
+  #  "sub"=>"U1234567890abcdefghijklmnopqrstuv",
+  #  "aud"=>"1234567890",
+  #  "exp"=>1641638901,
+  #  "iat"=>1641635301,
+  #  "name"=>"user name",
+  #  "picture"=>"https://this.is.an.image.url"
+  # }
+  def get_decoded_id_token
+    id_token = params["idToken"]
+    Kamiliff.line_login_client.verify_id_token(id_token: id_token)
+  end
+
 end

data/app/views/liff/_send_messages.liff.erb

@@ -0,0 +1,16 @@
+<%
+  messages = [messages] if messages.is_a? Hash
+  messages = messages.to_json if messages.is_a? Array
+%>
+
+<script>
+  (function(){
+    async function send_messages(){
+      const messages = <%= raw messages %>;
+      await liff.sendMessages(messages);
+      liff.closeWindow();
+    }
+
+    send_messages();
+  })();
+</script>

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

@@ -1,3 +1,8 @@
+<%
+  messages = [messages] if messages.is_a? Hash
+  messages = messages.to_json if messages.is_a? Array
+%>
+
 <script>
   (function(){
     async function share_target_picker(messages){

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

@@ -38,12 +38,22 @@ let open_liff_page = (function(){
     }
   }
 
+  async function get_liff_profile(){
+    try{
+      return await liff.getProfile();
+    }catch(error){
+      return {};
+    }
+  }
+
   async function get_liff_data(){
-    const profile = await liff.getProfile();
+    const profile = await get_liff_profile();
     const context = liff.getContext();
+    const idToken = liff.getIDToken();
     return {
-      profile,
-      context
+      context,
+      idToken,
+      profile
     }
   }
 

data/lib/kamiliff/version.rb

@@ -1,3 +1,3 @@
 module Kamiliff
-  VERSION = '0.31.0'
+  VERSION = '0.35.0'
 end

data/lib/kamiliff.rb

@@ -2,7 +2,50 @@ require "kamiliff/engine"
 require "kamiliff/services/base64_encode_service"
 require "kamiliff/services/base64_decode_service"
 require "kamiliff/services/liff_service"
+require "line_login"
 
 module Kamiliff
-  # Your code goes here...
+  # env
+  mattr_writer :line_login_channel_id
+  mattr_writer :line_login_channel_secret
+  mattr_writer :line_login_redirect_uri
+
+  mattr_writer :liff_url_compact
+  mattr_writer :liff_url_tall
+  mattr_writer :liff_url_full
+
+  def self.line_login_channel_id
+    @@line_login_channel_id || ENV["LINE_LOGIN_CHANNEL_ID"]
+  end
+
+  def self.line_login_channel_secret
+    @@line_login_channel_secret || ENV["LINE_LOGIN_CHANNEL_SECRET"]
+  end
+
+  def self.line_login_redirect_uri
+    @@line_login_redirect_uri || ENV["LINE_LOGIN_REDIRECT_URI"]
+  end
+
+  def self.liff_url_compact
+    @@liff_url_compact || ENV["LIFF_COMPACT"]
+  end
+
+  def self.liff_url_tall
+    @@liff_url_tall || ENV["LIFF_TALL"]
+  end
+
+  def self.liff_url_full
+    @@liff_url_full || ENV["LIFF_FULL"]
+  end
+
+  def self.line_login_client
+    @line_login_client ||= LineLogin::Client.new(
+      client_id: Kamiliff.line_login_channel_id,
+      client_secret: Kamiliff.line_login_channel_secret
+    )
+  end
+
+  def self.setup
+    yield self
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamiliff
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.35.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-07 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: line_login
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: An easy way to use LINE Front-end Framework(LIFF) on rails.
 email:
 - et284vu065k3@gmail.com
@@ -39,6 +53,7 @@ files:
 - app/helpers/liff_helper.rb
 - app/views/layouts/application.liff.erb
 - app/views/layouts/liff.html.erb
+- app/views/liff/_send_messages.liff.erb
 - app/views/liff/_share_target_picker.liff.erb
 - app/views/liff/entry.html.erb
 - app/views/liff/route.html.erb
@@ -72,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: An easy way to use LINE Front-end Framework(LIFF) on rails.