omniauth-ethereum 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e7d6bb22e75786a859fa75494b98c7f89de1516adaba495e5792f96dbb6a1c
-  data.tar.gz: b2df0312a95aaed2eb803074a6f0f6a9725042330692d76ce3d99e521b36e803
+  metadata.gz: 3559fd68d95f838f447ce5ce7e15cf72593779482d7b0dee33471261283aff25
+  data.tar.gz: 222cbb83cf1680c9acaa8abe1969de99b5897ec63026ecc4dc97db0bbf23343d
 SHA512:
-  metadata.gz: 5fda951ff144eb22a906dd82a1b831c72cee027d71676fe9bb911f52f870dad91915d40572c7f9a8ebdc6a473d8d75f3add6182512c242b4702a6c8f83fe5a30
-  data.tar.gz: 5f87d296ef4f9b568222fa9f305f2f8c5d6dd215b56d456b4daf30ee7d3898bbda61d6e14182b746f8c93887906b12d6b6c915e124d763d0612f94a0414af3c7
+  metadata.gz: e07df8b3516f97675f74a88ff903774b18d4c5d9a4e578534a917adbd802e95c285a3155a52874590f0cea0e92550100c0f15c194019a0f1839b70f7c96e4aa7
+  data.tar.gz: 2923ebbb1acbb140e6149a7914ba1f011620bea2af2256662124dfab8a520c73abbd9158ed98363c3649ec5dcc75370d3e26cc4c333270a2e9974f449b99177c

data/.github/workflows/test.yml

@@ -15,13 +15,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        ruby: ['2.7', '3.0']
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['2.7', '3.1']
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - name: Install Dependencies
       run: |
         bundle install

data/Gemfile.lock

@@ -1,52 +1,60 @@
 PATH
   remote: .
   specs:
-    omniauth-ethereum (0.1.0)
-      eth (~> 0.4.16)
-      omniauth (~> 2.0)
+    omniauth-ethereum (0.2.0)
+      eth (~> 0.5)
+      omniauth (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
-    eth (0.4.16)
-      ffi (~> 1.15)
-      keccak (~> 1.2)
-      money-tree (~> 0.10)
-      rlp (~> 0.7)
+    diff-lcs (1.5.0)
+    eth (0.5.2)
+      keccak (~> 1.3)
+      konstructor (~> 1.0)
+      openssl (~> 2.2)
+      rbsecp256k1 (~> 5.1)
       scrypt (~> 3.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     hashie (5.0.0)
-    keccak (1.2.2)
-    money-tree (0.10.0)
-      ffi
-    omniauth (2.0.4)
+    ipaddr (1.2.4)
+    keccak (1.3.0)
+    konstructor (1.0.2)
+    mini_portile2 (2.8.0)
+    omniauth (2.1.0)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
+    openssl (2.2.1)
+      ipaddr
+    pkg-config (1.4.7)
     rack (2.2.3)
-    rack-protection (2.1.0)
+    rack-protection (2.2.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.6)
-    rlp (0.7.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)
+    rbsecp256k1 (5.1.0)
+      mini_portile2 (~> 2.7)
+      pkg-config (~> 1.4)
+      rubyzip (~> 2.3)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubyzip (2.3.2)
     scrypt (3.0.7)
       ffi-compiler (>= 1.0, < 2.0)
 
@@ -56,7 +64,7 @@ PLATFORMS
 DEPENDENCIES
   omniauth-ethereum!
   rack-test (~> 1.1)
-  rspec (~> 3.10)
+  rspec (~> 3.11)
 
 BUNDLED WITH
    2.2.28

data/lib/new_session.js

@@ -22,7 +22,7 @@ if (typeof window.ethereum !== 'undefined') {
     const etherbase = accounts[0];
 
     // sign a message with current time
-    const customTitle = "Hello from Ruby!";
+    const customTitle = document.querySelector('.custom_title').textContent;
     const requestTime = Math.floor(new Date().getTime() / 1000);
     const message = customTitle + " " + requestTime;
     const signature = await personalSign(etherbase, message);

data/lib/omniauth-ethereum.rb

@@ -14,11 +14,13 @@ module OmniAuth
 
       # the `eth_address` will be the _fake_ unique identifier for the Ethereum strategy
       option :uid_field, :eth_address
-      option :fields, [:eth_message, :eth_address, :eth_signature]
-      option :uid_field, :eth_address
+
+      # this will be shown on signature screen
+      option :custom_title, 'Hello from Ruby!'
 
       def request_phase
         form = OmniAuth::Form.new :title => 'Ethereum Authentication', :url => callback_path
+        form.html("<span class='custom_title'>#{options.custom_title}</span>")
         options.fields.each do |field|
 
           # these fields are read-only and will be filled by javascript in the process
@@ -40,17 +42,17 @@ module OmniAuth
       end
 
       def callback_phase
-        address = request.params['eth_address'].downcase
-        message = request.params['eth_message']
-        signature = request.params['eth_signature']
-        signature_pubkey = Eth::Key.personal_recover message, signature
-        signature_address = (Eth::Utils.public_key_to_address signature_pubkey).downcase
 
+        message = request.params['eth_message']
         unix_time = message.scan(/\d+/).first.to_i
         ten_min = 10 * 60
         return fail!(:invalid_time) unless unix_time + ten_min >= now && unix_time - ten_min <= now
 
-        return fail!(:invalid_credentials) unless signature_address == address
+        address = Eth::Address.new request.params['eth_address']
+        signature = request.params['eth_signature']
+        signature_pubkey = Eth::Signature.personal_recover message, signature
+        signature_address = Eth::Util.public_key_to_address(signature_pubkey)
+        return fail!(:invalid_credentials) unless signature_address.to_s == address.to_s
 
         super
       end

data/omniauth-ethereum.gemspec

@@ -3,19 +3,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name           = 'omniauth-ethereum'
-  spec.version        = '0.1.0'
+  spec.version        = '0.2.0'
   spec.summary        = "OmniAuth Strategy for Ethereum"
   spec.description    = "Authentication Strategy for OmniAuth to authenticate a user with an Ethereum account"
   spec.authors        = ["Afri Schoedon"]
   spec.email          = 'gems@fault.dev'
-  spec.homepage       = 'https://github.com/q9f/omniauth-ethereum'
+  spec.homepage       = 'https://github.com/q9f/omniauth-ethereum.rb'
   spec.license        = 'Apache-2.0'
 
   spec.metadata       = {
-    'homepage_uri'    => 'https://github.com/q9f/omniauth-ethereum',
-    'source_code_uri' => 'https://github.com/q9f/omniauth-ethereum',
-    'github_repo'     => 'https://github.com/q9f/omniauth-ethereum',
-    'bug_tracker_uri' => 'https://github.com/q9f/omniauth-ethereum/issues',
+    'homepage_uri'    => 'https://github.com/q9f/omniauth-ethereum.rb',
+    'source_code_uri' => 'https://github.com/q9f/omniauth-ethereum.rb',
+    'github_repo'     => 'https://github.com/q9f/omniauth-ethereum.rb',
+    'bug_tracker_uri' => 'https://github.com/q9f/omniauth-ethereum.rb/issues',
   }.freeze
 
   spec.require_paths  = ["lib"]
@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.7", "< 4.0"
 
   # OmniAuth is what this strategy is providing
-  spec.add_dependency 'omniauth', '~> 2.0'
+  spec.add_dependency 'omniauth', '~> 2.1'
 
   # Use Ruby-Eth for signature recovery
-  spec.add_dependency 'eth', '~> 0.4.16'
+  spec.add_dependency 'eth', '~> 0.5'
 
   # Spec tests
-  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rspec', '~> 3.11'
   spec.add_development_dependency 'rack-test', '~> 1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-ethereum
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Afri Schoedon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: eth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.16
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.16
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -82,14 +82,14 @@ files:
 - lib/new_session.js
 - lib/omniauth-ethereum.rb
 - omniauth-ethereum.gemspec
-homepage: https://github.com/q9f/omniauth-ethereum
+homepage: https://github.com/q9f/omniauth-ethereum.rb
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://github.com/q9f/omniauth-ethereum
-  source_code_uri: https://github.com/q9f/omniauth-ethereum
-  github_repo: https://github.com/q9f/omniauth-ethereum
-  bug_tracker_uri: https://github.com/q9f/omniauth-ethereum/issues
+  homepage_uri: https://github.com/q9f/omniauth-ethereum.rb
+  source_code_uri: https://github.com/q9f/omniauth-ethereum.rb
+  github_repo: https://github.com/q9f/omniauth-ethereum.rb
+  bug_tracker_uri: https://github.com/q9f/omniauth-ethereum.rb/issues
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: OmniAuth Strategy for Ethereum