omniauth-telegram 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 465c3fbe0a9c88a70981edee957770a1007081422170ff2c777bcc4ffe14da62
-  data.tar.gz: 5150f90bc2f80b73b156dbee37a1a209bb3a9a3de3e4d75e7d9ea542ca161ae7
+  metadata.gz: 5334ef6176df287ae46257dedef283bf73ba261faf09a549244cd46b0e0afd92
+  data.tar.gz: f3765a5e3a66641eb832ac2bce0499c43e356c3130a4100dec9cb1d583bffa69
 SHA512:
-  metadata.gz: f6a0f7dfdabbb76797648501bb1ce650e3e9bd73a0568e65e767adbe5a2762051bf11a5b8c0e78260b31c47c67dccd1fb5acd94d8fb4d7389cee7bc110ba02cb
-  data.tar.gz: c2f76a11fa19e84033e5254bab6dd346fa6f21a54492089e2b3f79c12086a71668d4ca87ade6158bd0c531767bb3c44054b2db96c9ac3c914de87235711234dd
+  metadata.gz: c1618087b3cb265fafa1d3e0bd9ef5884600ee81753169750ac5872baee5512171d5dca98c0cea77d5b174d100daa934283fe38818a5aaf8d61125e33c2f87fe
+  data.tar.gz: f251ca92368438e15e2c8a6479e9b8d5137d278fec64a09587819f591270991a0fd97cdf4ec3d26ad19928a6aa62fb1d8d026d5420d4a83e7ba0ca4767cf2c38

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.2.0
+
+* update gem requirements for compatibility with OmniAuth 2.0 @phoet https://github.com/yurijmi/omniauth-telegram/pull/7

data/Gemfile.lock

@@ -1,41 +1,44 @@
 PATH
   remote: .
   specs:
-    omniauth-telegram (1.0.0)
-      omniauth (~> 1.0)
+    omniauth-telegram (0.2.0)
+      omniauth (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    hashie (3.5.7)
-    omniauth (1.8.1)
-      hashie (>= 3.4.6, < 3.6.0)
+    diff-lcs (1.4.4)
+    hashie (4.1.0)
+    omniauth (2.0.3)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    rack (2.0.5)
-    rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+      rack-protection
+    rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
+    rake (13.0.3)
+    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.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (>= 1.16)
   omniauth-telegram!
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  rake (>= 10.0)
+  rspec (>= 3.0)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -21,7 +21,7 @@ Here's a quick example, adding the middleware to a Rails app in `config/initiali
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :telegram, ENV['BOT_NAME'], ENV['BOT_SECRET']
+  provider :telegram, ENV['BOT_NICKNAME'], ENV['BOT_SECRET']
 end
 ```
 
@@ -31,7 +31,7 @@ You can customise the button (more info on telegram's api website):
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :telegram, ENV['BOT_NAME'], ENV['BOT_SECRET'],
+  provider :telegram, ENV['BOT_NICKNAME'], ENV['BOT_SECRET'],
     button_options: { 'request-access' => 'write' }
 end
 ```

data/lib/omniauth/strategies/telegram.rb

@@ -45,19 +45,11 @@ module OmniAuth
       end
       
       def callback_phase
-        unless FIELDS.all? { |f| request.params.include?(f) }
-          fail!(:field_missing)
+        if error = check_errors
+          fail!(error)
+        else
+          super
         end
-        
-        unless check_signature
-          fail!(:signature_mismatch)
-        end
-        
-        if Time.now.to_i - request.params["auth_date"].to_i > 86400
-          fail!(:session_expired)
-        end
-        
-        super
       end
       
       uid do
@@ -81,6 +73,16 @@ module OmniAuth
       end
       
       private
+
+      def check_errors
+        return :field_missing unless check_fields
+        return :signature_mismatch unless check_signature
+        return :session_expired unless check_session
+      end
+
+      def check_fields
+        FIELDS.all? { |f| request.params.include?(f) }
+      end
       
       def check_signature
         secret = OpenSSL::Digest::SHA256.digest(options[:bot_secret])
@@ -89,6 +91,10 @@ module OmniAuth
         
         request.params["hash"] == hashed_signature
       end
+
+      def check_session
+        Time.now.to_i - request.params["auth_date"].to_i <= 86400
+      end
     end
   end
 end

data/lib/omniauth/telegram/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Telegram
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/omniauth-telegram.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "omniauth", "~> 1.0"
+  spec.add_dependency "omniauth", ">= 1.0"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", ">= 1.16"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "rspec", ">= 3.0"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-telegram
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuri Mikhaylov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: An OmniAuth strategy for Telegram
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -104,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: An OmniAuth strategy for Telegram