omniauth-feishu 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843abb9c674bd1cf0899fc1b27dbded35cc719bf8eb8f2b5bef0dc1924c0c33d
-  data.tar.gz: 7f84f3053d7079d5769a6b37a445787d6d8dba6d234fba9f8a64909dc7ca2804
+  metadata.gz: ac97f7c1d2639fdb1b2812ec5d6cb66cc636be214d17b69a89c00e32e3981551
+  data.tar.gz: 02ddf74e3a7255059390cc9dbf268572050f52ad00a9fc9ede60fdc1e60998ea
 SHA512:
-  metadata.gz: 6d5f23d921674ad9bac38c5ace9a1f034c1c6fa77d0cc7cecedd7f4dedc0425620d68dfd7303280e5a89735f16d28354abfebd4f9d2b1c1889520434ef09a0fb
-  data.tar.gz: c4be60d376e3249c8ba94a4243948859ee555c089161112c180f5c3fdb855892633f30b8cd3468cb836cbbfa0ee6430cb84c8e42501790f40323eb1a61545dfd
+  metadata.gz: fa62ebaa035fa8c04b2e27ab8064340fb2d5209a20dfc85de806ddcf6413608a68e6378647c5ce92e090295392b9e6fb1783217cd247ffb0ae6f16136394db08
+  data.tar.gz: 1ba97b40558d0c54f4cba6bbfaa155082620a090dc6420f3dcc9103c2fd18b44c59956336a05526ea19f2ffdef6f5077ada17563a0232fe9efd491449e18c981

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+Gemfile.lock

data/lib/omniauth/feishu/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Feishu
-    VERSION = "0.1.5"
+    VERSION = "0.1.8"
   end
 end

data/lib/omniauth/strategies/feishu.rb

@@ -2,21 +2,26 @@ require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
+
+    # 飞书登录
+    #
+    # 飞书要求请求采用 json 格式主体，很多都需要自定义
+    # 官方文档： https://open.feishu.cn/document/ukTMukTMukTM/uETOwYjLxkDM24SM5AjN
     class Feishu < OmniAuth::Strategies::OAuth2
       class NoAppAccessTokenError < StandardError; end
 
-      attr_reader :app_access_token
-
       option :name, 'feishu'
 
       option :client_options, {
-        site: 'https://open.feishu.cn',
-        authorize_url: "/open-apis/authen/v1/user_auth_page_beta",
-        token_url: "https://open.feishu.cn/open-apis/authen/v1/access_token",
-        app_access_token_url: "https://open.feishu.cn/open-apis/auth/v3/app_access_token/internal",
-        user_info_url: "https://open.feishu.cn/open-apis/authen/v1/user_info"
+        site: 'https://open.feishu.cn/open-apis/authen/v1/',
+        authorize_url: 'user_auth_page_beta',
+        token_url: 'access_token',
+        app_access_token_url: 'https://open.feishu.cn/open-apis/auth/v3/app_access_token/internal',
+        user_info_url: 'user_info'
       }
 
+      uid { raw_info['user_id'] }
+
       info do
         {
           name: raw_info['name'],
@@ -26,24 +31,21 @@ module OmniAuth
           avatar_thumb: raw_info['avatar_thumb'],
           avatar_middle: raw_info['avatar_middle'],
           avatar_big: raw_info['avatar_big'],
-          user_id: raw_info['user_id'], 
-          union_id: raw_info['union_id'], 
-          open_id: raw_info['open_id'], 
-          en_name: raw_info['en_name'], 
-          app_access_token: @app_access_token
+          user_id: raw_info['user_id'],
+          union_id: raw_info['union_id'],
+          open_id: raw_info['open_id'],
+          en_name: raw_info['en_name']
         }
       end
 
       def raw_info
-        @raw_info ||= begin
-          response = Faraday.get(
-            options.client_options.user_info_url,
-            nil,
-            content_type: 'application/json', authorization: "Bearer #{access_token.token}"
-          )
-          response_body = JSON.parse(response.body)
-          response_body['data']
-        end
+        @raw_info ||= client.request(:get, options.client_options.user_info_url,
+                                      { headers: {
+                                          'Content-Type' => 'application/json; charset=utf-8',
+                                          'Authorization' => "Bearer #{access_token.token}"
+                                        }
+                                      })
+                            .parsed['data']
       end
 
       def authorize_params
@@ -52,35 +54,43 @@ module OmniAuth
         end
       end
 
+      # 飞书采用非标准 OAuth 2 请求体和返回结构体，需要自定义
       def build_access_token
-        resp = Faraday.post(
-          options.client_options.token_url,
-          { code: request.params["code"], app_access_token: app_access_token, grant_type: "authorization_code" }.to_json,
-          content_type: "application/json"
-        )
-        data = JSON.parse(resp.body)['data']
-        ::OAuth2::AccessToken.from_hash(client, data)
-      end
+        code = request.params['code']
+        data = client.request(:post, options.client_options.token_url,
+                              { body: {
+                                  code: code,
+                                  grant_type: 'authorization_code'
+                                }.to_json,
+                                headers: {
+                                  'Content-Type' => 'application/json; charset=utf-8',
+                                  'Authorization' => "Bearer #{app_access_token}"
+                                }
+                              })
+                      .parsed['data']
 
-      def callback_phase
-        get_app_access_token
-        super
+        ::OAuth2::AccessToken.from_hash(client, data)
       end
 
       private
 
-      def get_app_access_token
-        resp = Faraday.post(
-          options.client_options.app_access_token_url,
-          { app_id: options.client_id, app_secret: options.client_secret }.to_json,
-          content_type: "application/json"
-        )
-        response_body = JSON.parse(resp.body)
-        if response_body.key?('app_access_token')
-          @app_access_token = response_body['app_access_token']
-        else
-          raise NoAppAccessTokenError, "cannot get app_access_token."
-        end
+      def app_access_token
+        return @app_access_token if @app_access_token
+
+        @app_access_token ||= client.request(:post, options.client_options.app_access_token_url,
+                                              { body: {
+                                                  app_id: options.client_id,
+                                                  app_secret: options.client_secret
+                                                }.to_json,
+                                                headers: {
+                                                  'Content-Type' => 'application/json; charset=utf-8'
+                                                }
+                                              })
+                                    .parsed['app_access_token']
+
+        raise NoAppAccessTokenError, 'No app access token' unless @app_access_token
+
+        @app_access_token
       end
     end
   end

data/omniauth-feishu.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
   spec.license       = "MIT"
 
-  spec.add_dependency "omniauth-oauth2", "~> 1.6.0"
+  spec.add_dependency "omniauth-oauth2", ">= 1.6.0", "< 2"
 
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  # spec.add_development_dependency "rake"
+  # spec.add_development_dependency "rspec"
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,76 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-feishu
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Renny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 1.6.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description:
 email:
 - rennyallen@hotmail.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- _config.yml
-- bin/console
-- bin/setup
 - lib/omniauth/feishu.rb
 - lib/omniauth/feishu/version.rb
 - lib/omniauth/strategies/feishu.rb
@@ -94,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Lark(Feishu) OAuth2 Strategy for OmniAuth

data/Gemfile.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omniauth-feishu (0.1.5)
-      omniauth-oauth2 (~> 1.6.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.4.4)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.0)
-    hashie (4.1.0)
-    jwt (2.2.2)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
-    rack (2.2.3)
-    rake (12.3.2)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    ruby2_keywords (0.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  omniauth-feishu!
-  rake (~> 12.0)
-  rspec
-
-BUNDLED WITH
-   2.1.4

data/_config.yml

@@ -1,2 +0,0 @@
-theme: jekyll-theme-cayman
-show_downloads: true

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "omniauth/feishu"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here