omniauth-zalo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb72119b74863c473c1d8d613f9a2bbc54f5566cf771cbd3d0e3922f5f615e35
-  data.tar.gz: c391c3f835985655a3ac631a1df44c524e23237f04103b542681d719baf19752
+  metadata.gz: 292344ac127119e787f65937437da02b1b78695e0619449e87bddca5af2be89d
+  data.tar.gz: b8e4311dd36265f0a86cfaa015f92002ae5e19503493672515e123e63db55dc2
 SHA512:
-  metadata.gz: 8ecab798f75edc89fd1d537c67587224d1f59c1187a2b6d0742ce0b44c86c2401937373620929c2cd0b1aaeae4c9fc084c595b0f8793915b846532333a6d9d6a
-  data.tar.gz: a6defc433f4d9df4e5f3b8f3d93fc7e9ac1e6b46a80aec2c17ea5b70133353ece36b3575440bad2f460707d92e7f24eae07d627c4965f0aaf71b0b844be9c9ea
+  metadata.gz: a60be850cc6fccb9f2f6d00e53091f971a64e21abbd94af369e121422182f88919abb8b97099e7f8baf3c2c9ad4c796135fdac365db3395076956a477203518d
+  data.tar.gz: 964626fc00cfacb419a7baf1f0f9d1355181169ac51cfaa1dde481efb065e543c0f441f8a726d59ccc8d529f2f361fbb1c251c7cc9a3512f226126fe786aea7d

data/README.md

@@ -1,8 +1,6 @@
-# Omniauth::Zalo
+# OmniAuth::Zalo
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/omniauth/zalo`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+OmniAuth strategy for [Sign In with Zalo](https://developers.zalo.me/).
 
 ## Installation
 
@@ -14,7 +12,7 @@ gem 'omniauth-zalo'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -23,28 +21,18 @@ Or install it yourself as:
 ## Usage
 omniauth.rb
 
-```
+```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :zalo, ENV['APP_ID'], env['SERECT_ID']
 end
 ```
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/omniauth-zalo. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nguyenthanhcong101096/omniauth-zalo
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-## Code of Conduct
-
-Everyone interacting in the Omniauth::Zalo project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/omniauth-zalo/blob/master/CODE_OF_CONDUCT.md).

data/lib/omniauth/strategies/build_access_token.rb

@@ -0,0 +1,46 @@
+module OmniAuth
+  module Strategies
+    module BuildAccessToken
+      def oauth2_access_token
+        access_token_response = client.request(access_token_method, access_token_url, headers: access_token_headers, parse: :json).parsed
+
+        hash = {
+          :access_token => access_token_response["access_token"],
+          :expires_in => access_token_response["expires_in"],
+        }
+
+        ::OAuth2::AccessToken.from_hash(client, hash)
+      end
+
+      def get_user_info
+        @raw_info ||= JSON.load(access_token.get("https://graph.zalo.me/v2.0/me?access_token=#{access_token.token}&fields=id,birthday,name,gender,picture,phone").body)
+      rescue ::Errno::ETIMEDOUT
+        raise ::Timeout::Error
+      end
+
+      private
+
+      def access_token_method
+        options.client_options.token_method
+      end
+
+      def access_token_headers
+        { "secret_key" => options.client_secret }
+      end
+
+      def access_token_url
+        client.token_url(access_token_params)
+      end
+
+      def access_token_params
+        {}.tap do |params|
+          params[:redirect_uri]  = callback_url
+          params[:app_id]        = options.client_id
+          params[:code]          = request.params['code']
+          params[:code_verifier] = options.client_options.code_verifier
+          params[:grant_type]    = options.client_options.grant_type
+        end
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/zalo.rb

@@ -4,13 +4,18 @@ require 'json'
 module OmniAuth
   module Strategies
     class Zalo < OmniAuth::Strategies::OAuth2
+      include BuildAccessToken
+
       option :name, 'zalo'
 
       option :client_options, {
         site: 'https://oauth.zaloapp.com',
-        authorize_url: '/v3/auth',
-        token_url: '/v3/access_token',
-        token_method: :get,
+        authorize_url: '/v4/permission',
+        token_url: '/v4/access_token',
+        token_method: :post,
+        grant_type: 'authorization_code',
+        code_challenge: 'is5SvnFPQzBNP-nb-poEaFlsvK1a6S3NpVCz0vcHh0w',
+        code_verifier: 'h57bycdwryntewreomnbSyDrAG4kX7BeqS7g-luzvBE'
       }
 
       option :provider_ignores_state, true
@@ -25,17 +30,15 @@ module OmniAuth
       end
 
       def authorize_params
-        super.merge(app_id: self.options.client_id)
+        super.merge(app_id: self.options.client_id, code_challenge: options.client_options.code_challenge)
       end
 
       def build_access_token
-        token_url_params = {app_id: options.client_id, app_secret: options.client_secret, code: request.params['code'], redirect_uri: callback_url}.merge(token_params.to_hash(:symbolize_keys => true))
-        parsed_response = client.request(options.client_options.token_method, client.token_url(token_url_params), parse: :json).parsed
-        hash = {
-          :access_token => parsed_response["access_token"],
-          :expires_in => parsed_response["expires_in"],
-        }
-        ::OAuth2::AccessToken.from_hash(client, hash)
+        oauth2_access_token
+      end
+
+      def raw_info
+        get_user_info
       end
 
       alias :old_callback_url :callback_url
@@ -47,12 +50,6 @@ module OmniAuth
           old_callback_url
         end
       end
-
-      def raw_info
-        @raw_info ||= JSON.load(access_token.get("https://graph.zalo.me/v2.0/me?access_token=#{access_token.token}&fields=id,birthday,name,gender,picture,phone").body)
-      rescue ::Errno::ETIMEDOUT
-        raise ::Timeout::Error
-      end
     end
   end
 end

data/lib/omniauth/zalo/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Zalo
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/omniauth/zalo.rb

@@ -2,6 +2,7 @@ require 'rails'
 require 'set'
 require 'active_support/dependencies'
 require 'omniauth/zalo/version'
+require 'omniauth/strategies/build_access_token'
 require 'omniauth/strategies/zalo'
 
 module Omniauth

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-zalo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - nguyenthanhcong101096
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,20 +74,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/omniauth/strategies/build_access_token.rb
 - lib/omniauth/strategies/zalo.rb
 - lib/omniauth/zalo.rb
-- lib/omniauth/zalo/oauth.rb
 - lib/omniauth/zalo/version.rb
-- omniauth-zalo-0.1.0.gem
-- omniauth-zalo-0.1.1.gem
-- omniauth-zalo-0.1.2.gem
-- omniauth-zalo-0.1.3.gem
 - omniauth-zalo.gemspec
 homepage: https://github.com/nguyenthanhcong101096/omniauth-zalo
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,9 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: this is the all module for wakuwaku appkication
 test_files: []

data/lib/omniauth/zalo/oauth.rb

@@ -1,25 +0,0 @@
-# module Omniauth
-#   class Zalo::Oauth
-#     attr_reader :app_id, :app_secret, :redirect_uri, :state
-    
-#     # client_options = {
-#     #   site: 'https://oauth.zaloapp.com',
-#     #   authorize_url: "/v3/auth?app_id=#{app_id}&redirect_uri=#{redirect_uri}&state=#{state}",
-#     #   access_token_url: "/v3/access_token?app_id=#{app_id}&app_secret=#{app_secret}&code=#{code}",
-#     #   account_info_url: "https://graph.zalo.me/v2.0/me?access_token=#{token}&fields=id,birthday,name,gender,picture,phone"
-#     # }
-    
-#     def initialize(app_id, app_secret, redirect_uri)
-#       @app_id       = app_id
-#       @app_secret   = app_secret
-#       @redirect_uri = redirect_uri
-#       @state        = state_hex
-#     end
-    
-#     private
-    
-#     def state_hex
-#       SecureRandom.hex
-#     end
-#   end
-# end