omniauth-seznam-cz 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9271faeba9c9cea0f61c4e121255521bde0b3852c8170e807071793d550710ed
-  data.tar.gz: 89eb3f23cc24cef52e775f029e0532354c77be40fc3da4da7deb5ad66af03997
+  metadata.gz: b50b0a245cbaf3a116526977f608e7f16fa340e3ae773a808df284d6af2371f3
+  data.tar.gz: 0ed84fd322352e4475007cf95f89ef4cc2c8893b28d357f4ed580103a7da8dac
 SHA512:
-  metadata.gz: '03235926e68fbb8016ba3f0511b77458befedd8a6f61c32c51f9e8784707ac9b60db4a6685982faf8ca5548e5deb24d223bff4a0cca38baa7b2aec7bd795ce84'
-  data.tar.gz: 960ca9ced83c30fc181f8846054f0c7e428059eae600641abe743759f7e41a6af9c10dde81e3c0573a4d2367e869b04213a23494b664e7ff54d1e443deab2f57
+  metadata.gz: 88ea2c7a4697174ea6efcf6455ece58f1021eb7f843753d3dd2b258ff7c59d3745009ef3700d0d2fe762b90e1658b376fdffccd3c7cea8bbdc4a56b2557718b6
+  data.tar.gz: f34371a3666f9ea950f80b43e7841304d25850181d50054290fc97bd938466c2948bf7ed4f7bf71eb743f214df36511c6efb2a07bba77b05ad0ad579651f0bd7

data/.gitignore

@@ -10,3 +10,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea/
+Gemfile.lock

data/README.md

@@ -47,23 +47,33 @@ Here's an example of an authentication hash available in the callback by accessi
 
 ```ruby
 {
-  "provider" => "seznam_cz",
-  "uid" => "100000000000000000000",
-  "info" => {
-    "name" => "John Smith",
-    "email" => "john@example.com",
-    "first_name" => "John",
-    "last_name" => "Smith",
-    "image" => "https://lh4.googleusercontent.com/photo.jpg",
-    "urls" => {
-      "google" => "https://plus.google.com/+JohnSmith"
-    }
+  "provider": "seznam_cz",
+  "uid": "100000000000000000000",
+  "info": {
+    "name": "Jan Sterba",
+    "email": "jan.sterba@seznam.cz",
+    "firstname": "Jan",
+    "lastname": "Sterba",
+    "contact_phone": null,
+    "avatar_url": null
+  },
+  "credentials": {
+    "token": "TOKEN",
+    "refresh_token": "REFRESH_TOKEN",
+    "expires_at": 1672768905,
+    "expires": true
   },
-  "credentials" => {
-    "token" => "TOKEN",
-    "refresh_token" => "REFRESH_TOKEN",
-    "expires_at" => 1496120719,
-    "expires" => true
+  "extra": {
+    "raw_info": {
+      "advert_user_id": "100000000000000000000",
+      "domain": "seznam.cz",
+      "firstname": "Jan",
+      "lastname": "Sterba",
+      "message": "ok",
+      "oauth_user_id": "100000000000000000001",
+      "status": 200,
+      "username": "jan.sterba"
+    }
   }
 }
 ```

data/bin/publish-gem.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm *.gem
+gem build omniauth-seznam-cz.gemspec
+gem push omniauth-seznam-cz-*.gem

data/lib/omniauth/seznam_cz/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module SeznamCz
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

data/lib/omniauth/strategies/seznam_cz.rb

@@ -12,7 +12,6 @@ module OmniAuth
       BASE_SCOPES = %w[identity contact-phone avatar].freeze
       DEFAULT_SCOPE = 'identity'
       USER_INFO_URL = 'https://login.szn.cz/api/v1/user'
-      IMAGE_SIZE_REGEXP = /(s\d+(-c)?)|(w\d+-h\d+(-c)?)|(w\d+(-c)?)|(h\d+(-c)?)|c/
 
       option :name, 'seznam_cz'
       option :skip_image_info, true
@@ -20,9 +19,10 @@ module OmniAuth
       option :authorized_client_ids, []
 
       option :client_options,
-             site: 'https://login.szn.cz/api/v1/oauth',
-             authorize_url: 'https://login.szn.cz/api/v1/oauth/auth',
-             token_url: 'https://login.szn.cz/api/v1/oauth/token'
+             site: 'https://login.szn.cz',
+             authorize_url: '/api/v1/oauth/auth',
+             token_url: '/api/v1/oauth/token',
+             auth_scheme: :request_body
 
       def authorize_params
         super.tap do |params|
@@ -35,14 +35,14 @@ module OmniAuth
         end
       end
 
-      uid { raw_info['sub'] }
+      uid { raw_info['oauth_user_id'] }
 
       info do
         {
-          username: raw_info['username'],
-          email: raw_info['username'],
-          domain: raw_info['domain'],
+          name: "#{raw_info['firstname']} #{raw_info['lastname']}",
+          email: "#{raw_info['username']}@#{raw_info['domain']}",
           firstname: raw_info['firstname'],
+          lastname: raw_info['lastname'],
           contact_phone: raw_info['contact-phone'],
           avatar_url: raw_info['avatar-url']
         }
@@ -52,6 +52,10 @@ module OmniAuth
         { 'raw_info' => raw_info }
       end
 
+      def callback_url
+        full_host + callback_path
+      end
+
       def raw_info
         @raw_info ||= access_token.get(USER_INFO_URL).parsed
       end

data/spec/omniauth/strategies/seznam_cz_spec.rb

@@ -31,15 +31,15 @@ describe OmniAuth::Strategies::SeznamCz do
 
   describe '#client_options' do
     it 'has correct site' do
-      expect(subject.client.site).to eq('https://login.szn.cz/api/v1/oauth')
+      expect(subject.client.site).to eq('https://login.szn.cz')
     end
 
     it 'has correct authorize_url' do
-      expect(subject.client.options[:authorize_url]).to eq('https://login.szn.cz/api/v1/oauth/auth')
+      expect(subject.client.options[:authorize_url]).to eq('/api/v1/oauth/auth')
     end
 
     it 'has correct token_url' do
-      expect(subject.client.options[:token_url]).to eq('https://login.szn.cz/api/v1/oauth/token')
+      expect(subject.client.options[:token_url]).to eq('/api/v1/oauth/token')
     end
 
     describe 'overrides' do
@@ -188,5 +188,4 @@ describe OmniAuth::Strategies::SeznamCz do
       expect(subject.token_params['bad']).to eq(nil)
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-seznam-cz
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Jan Sterba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -107,9 +107,9 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
+- bin/publish-gem.sh
 - lib/omniauth-seznam-cz.rb
 - lib/omniauth/seznam_cz.rb
 - lib/omniauth/seznam_cz/version.rb

data/Gemfile.lock

@@ -1,99 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omniauth-seznam-cz (0.0.1)
-      oauth2 (~> 1.1)
-      omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.7.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    diff-lcs (1.5.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    hashie (5.0.0)
-    jwt (2.3.0)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (2.0.4)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-      rack-protection
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
-    parallel (1.21.0)
-    parser (3.0.3.2)
-      ast (~> 2.4.1)
-    rack (2.2.3)
-    rack-protection (2.1.0)
-      rack
-    rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (2.2.0)
-    rexml (3.2.5)
-    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.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (0.93.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    unicode-display_width (1.8.0)
-
-PLATFORMS
-  arm64-darwin-20
-
-DEPENDENCIES
-  omniauth-seznam-cz!
-  rake (~> 12.0)
-  rspec (~> 3.6)
-  rubocop (~> 0.49)
-
-BUNDLED WITH
-   2.2.16