Allow omniauth 2.0, specify user URL as https

This commit is contained in:
ErickSkrauch 2023-11-04 02:57:18 +01:00
parent 206fd5f3e3
commit 4ff4af6897
No known key found for this signature in database
GPG Key ID: 669339FCBB30EE0E
5 changed files with 78 additions and 69 deletions

View File

@ -1,36 +1,40 @@
PATH PATH
remote: . remote: .
specs: specs:
omniauth-ely (0.1.0) omniauth-ely (0.2.1)
omniauth (~> 1.0) omniauth (>= 1.0, < 3.0)
omniauth-oauth2 (>= 1.1.1, < 2.0) omniauth-oauth2 (>= 1.1.1, < 2.0)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
addressable (2.5.2) addressable (2.8.5)
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 6.0)
coderay (1.1.2) base64 (0.1.1)
crack (0.4.3) coderay (1.1.3)
safe_yaml (~> 1.0.0) crack (0.4.5)
diff-lcs (1.3) rexml
docile (1.1.5) diff-lcs (1.5.0)
faraday (0.12.2) docile (1.4.0)
multipart-post (>= 1.2, < 3) faraday (2.7.11)
ffi (1.9.18) base64
formatador (0.2.5) faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
ffi (1.16.3)
formatador (1.1.0)
growl (1.0.3) growl (1.0.3)
guard (2.14.1) guard (2.18.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (>= 2.7, < 4.0) listen (>= 2.7, < 4.0)
lumberjack (~> 1.0) lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1) nenv (~> 0.1)
notiffany (~> 0.0) notiffany (~> 0.0)
pry (>= 0.9.12) pry (>= 0.13.0)
shellany (~> 0.0) shellany (~> 0.0)
thor (>= 0.18.1) thor (>= 0.18.1)
guard-bundler (2.1.0) guard-bundler (3.0.1)
bundler (~> 1.0) bundler (>= 2.1, < 3)
guard (~> 2.2) guard (~> 2.2)
guard-compat (~> 1.1) guard-compat (~> 1.1)
guard-compat (1.2.1) guard-compat (1.2.1)
@ -38,45 +42,46 @@ GEM
guard (~> 2.1) guard (~> 2.1)
guard-compat (~> 1.1) guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0) rspec (>= 2.99.0, < 4.0)
hashdiff (0.3.7) hashdiff (1.0.1)
hashie (3.5.6) hashie (5.0.0)
json (2.1.0) jwt (2.7.1)
jwt (1.5.6) listen (3.8.0)
listen (3.1.5) rb-fsevent (~> 0.10, >= 0.10.3)
rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.10)
rb-inotify (~> 0.9, >= 0.9.7) lumberjack (1.2.9)
ruby_dep (~> 1.2) method_source (1.0.0)
lumberjack (1.0.12)
method_source (0.9.0)
multi_json (1.12.2)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.0.0)
nenv (0.3.0) nenv (0.3.0)
notiffany (0.1.1) notiffany (0.1.3)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
oauth2 (1.4.0) oauth2 (2.0.9)
faraday (>= 0.8, < 0.13) faraday (>= 0.17.3, < 3.0)
jwt (~> 1.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 4)
omniauth (1.7.1) snaky_hash (~> 2.0)
hashie (>= 3.4.6, < 3.6.0) version_gem (~> 1.1)
rack (>= 1.6.2, < 3) omniauth (2.1.1)
omniauth-oauth2 (1.4.0) hashie (>= 3.4.6)
oauth2 (~> 1.0) rack (>= 2.2.3)
omniauth (~> 1.2) rack-protection
pry (0.11.2) omniauth-oauth2 (1.8.0)
coderay (~> 1.1.0) oauth2 (>= 1.4, < 3)
method_source (~> 0.9.0) omniauth (~> 2.0)
public_suffix (3.0.0) pry (0.14.2)
rack (2.0.3) coderay (~> 1.1)
rack-test (0.7.0) method_source (~> 1.0)
rack (>= 1.0, < 3) public_suffix (5.0.3)
rb-fsevent (0.10.2) rack (3.0.8)
rb-inotify (0.9.10) rack-protection (3.0.6)
ffi (>= 0.5.0, < 2) rack
rack-test (2.1.0)
rack (>= 1.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rspec (2.99.0) rspec (2.99.0)
rspec-core (~> 2.99.0) rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0) rspec-expectations (~> 2.99.0)
@ -85,22 +90,26 @@ GEM
rspec-expectations (2.99.2) rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.99.4) rspec-mocks (2.99.4)
ruby_dep (1.5.0) ruby2_keywords (0.0.5)
safe_yaml (1.0.4)
shellany (0.0.1) shellany (0.0.1)
simplecov (0.15.1) simplecov (0.22.0)
docile (~> 1.1.0) docile (~> 1.1)
json (>= 1.8, < 3) simplecov-html (~> 0.11)
simplecov-html (~> 0.10.0) simplecov_json_formatter (~> 0.1)
simplecov-html (0.10.2) simplecov-html (0.12.3)
thor (0.20.0) simplecov_json_formatter (0.1.4)
webmock (3.1.0) snaky_hash (2.0.1)
addressable (>= 2.3.6) hashie
version_gem (~> 1.1, >= 1.1.1)
thor (1.3.0)
version_gem (1.1.3)
webmock (3.19.1)
addressable (>= 2.8.0)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff (>= 0.4.0, < 2.0.0)
PLATFORMS PLATFORMS
ruby x86_64-linux
DEPENDENCIES DEPENDENCIES
growl growl
@ -115,4 +124,4 @@ DEPENDENCIES
webmock webmock
BUNDLED WITH BUNDLED WITH
1.16.0 2.4.20

View File

@ -1,5 +1,5 @@
module OmniAuth module OmniAuth
module Ely module Ely
VERSION = '0.2.0' VERSION = '0.2.1'
end end
end end

View File

@ -40,7 +40,7 @@ module OmniAuth
end end
def profile_url def profile_url
'http://ely.by/u' + raw_info['id'].to_s 'https://ely.by/u' + raw_info['id'].to_s
end end
def callback_url def callback_url

View File

@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
gem.description = %q{Official OmniAuth strategy for Ely.by.} gem.description = %q{Official OmniAuth strategy for Ely.by.}
gem.summary = %q{Official OmniAuth strategy for Ely.by.} gem.summary = %q{Official OmniAuth strategy for Ely.by.}
gem.add_dependency 'omniauth', '~> 1.0' gem.add_dependency 'omniauth', '>= 1.0', '< 3.0'
gem.add_dependency 'omniauth-oauth2', '>= 1.1.1', '< 2.0' gem.add_dependency 'omniauth-oauth2', '>= 1.1.1', '< 2.0'
gem.add_development_dependency 'rspec', '~> 2.7' gem.add_development_dependency 'rspec', '~> 2.7'
gem.add_development_dependency 'rack-test' gem.add_development_dependency 'rack-test'

View File

@ -37,7 +37,7 @@ describe OmniAuth::Strategies::Ely do
raw_info = Hash.new raw_info = Hash.new
raw_info['id'] = 1 raw_info['id'] = 1
allow(subject).to receive(:raw_info).and_return(raw_info) allow(subject).to receive(:raw_info).and_return(raw_info)
expect(subject.profile_url).to eq('http://ely.by/u1') expect(subject.profile_url).to eq('https://ely.by/u1')
end end
it 'should build valid skin link' do it 'should build valid skin link' do