omniauth-dex-energy 0.1.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db21340318e6c6ec779b2ec49ceb443b2081d28d1f8a00f93609cf586ae99214
-  data.tar.gz: a173e8118f3c4f21d144b01ca4abdcce995b043ac3a50a2af7b0f7af41ed5c59
+  metadata.gz: e3b098d118fe551bc1fd8904455175e21ac5196e5463135347a910f97cb46523
+  data.tar.gz: fafa972c321517c6cdd4a7f5a5082ed1ddc495b9442149b8ecbe80b57928fdaa
 SHA512:
-  metadata.gz: 15ee58797637d3598e51a380bb51f8e5fda5027f6fac39a5cd3648da7422b11e640e0413bc6ff8903a1490bc97b2e0734ab013b6dff05427961dc654645867e4
-  data.tar.gz: ce2d105652dae81d7146be104b2648ce6476c51941cf16f38c037c161b6ecaeed487da52161bb820f9487ba122fa5975cc264dbdf80c70648bdbcc8b7355f2e7
+  metadata.gz: d2bf63767b41f1600d3acfbf2cfe467eb59633798d3d7bbd9636a702b540ef3a855d1b9c27dbaf261cc317f902151b525d1cfa31ae8de47a2befa44c09eeb6fc
+  data.tar.gz: 280442e2d4b8d47325539230ce1c361034baafb621c7ad8df4b2448c9451b28365f3e4cf8ee0e4c25eca9f0c6612b007e92f460fac87b431c8e8d2960280223e

data/README.md

@@ -1,6 +1,7 @@
 # omniauth-dex-energy
 
 ![CI](https://github.com/greensync/omniauth-dex-energy/workflows/CI/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/omniauth-dex-energy.png)](https://badge.fury.io/rb/omniauth-dex-energy)
 
 An OmniAuth strategy to authenticate with deX.
 
@@ -26,11 +27,15 @@ gem 'omniauth-dex-energy'
 
 And then execute:
 
-    $ bundle install
+```sh
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install omniauth-dex-energy
+```sh
+gem install omniauth-dex-energy
+```
 
 ## Usage
 

data/bin/publish-gem

@@ -4,5 +4,6 @@ set -Eeuo pipefail
 
 version=$(git describe --exact-match HEAD)
 
+git push origin ${version}
 gem build omniauth-dex-energy
 gem push omniauth-dex-energy-${version}.gem

data/examples/sinatra/Gemfile

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
 gem 'omniauth-dex-energy'
 gem 'puma'
 gem 'sinatra'

data/examples/sinatra/Gemfile.lock

@@ -1,46 +1,47 @@
 GEM
+  remote: https://rubygems.org/
   specs:
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     foreman (0.86.0)
-    hashie (3.6.0)
+    hashie (5.0.0)
     jwt (2.2.1)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mustermann (1.1.0)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    nio4r (2.5.2)
-    oauth2 (1.4.3)
+    nio4r (2.5.9)
+    oauth2 (1.4.4)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.2)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-dex-energy (0.1.0)
-      omniauth-oauth2 (~> 1.6.0)
+    omniauth-dex-energy (0.1.1)
+      omniauth-oauth2 (~> 1.6)
     omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
-    puma (4.3.1)
+    puma (6.3.1)
       nio4r (~> 2.0)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
+    rack (2.2.8)
+    rack-protection (2.2.3)
       rack
-    ruby2_keywords (0.0.1)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+    ruby2_keywords (0.0.5)
+    sinatra (2.2.3)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.3)
       tilt (~> 2.0)
     slim (4.0.1)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
     temple (0.8.2)
-    tilt (2.0.10)
+    tilt (2.0.11)
 
 PLATFORMS
   ruby
@@ -53,4 +54,4 @@ DEPENDENCIES
   slim
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/examples/sinatra/app.rb

@@ -8,6 +8,7 @@ oauth2_client_id = ENV['OAUTH2_CLIENT_ID']
 oauth2_client_secret = ENV['OAUTH2_CLIENT_SECRET']
 
 use Rack::Session::Cookie
+use Rack::Protection::AuthenticityToken
 
 use OmniAuth::Builder do
   provider :dex_energy, oauth2_client_id, oauth2_client_secret
@@ -19,8 +20,7 @@ get '/' do
 end
 
 get '/login' do
-  # Redirect the user to the endpoint provided by OmniAuth.
-  redirect to("/auth/dex_energy?origin=#{URI.encode_www_form_component(request.referrer)}")
+  slim :login
 end
 
 get '/auth/dex_energy/callback' do
@@ -31,7 +31,14 @@ get '/auth/dex_energy/callback' do
 end
 
 get '/logout' do
-  # Log the user out of their session in the app - but not in the Identity Provider.
+  # Log the user out of their session in the app, and then redirect them to the IdP
+  # so that it can log them out.
+  # The user will be redirect back to us afterwards.
   session.delete(:user)
-  redirect request.referrer
+
+  logout_url = OmniAuth::Strategies::DexEnergy.logout_uri(
+    client_id: oauth2_client_id,
+    redirect_uri: to('/'),
+  )
+  redirect logout_url
 end

data/examples/sinatra/views/hello.slim

@@ -5,4 +5,4 @@ ul
     - if @user
       a href="/logout" Log out
     - else
-      a href="/login" Log in
+      a href="/login" Go to login page

data/examples/sinatra/views/login.slim

@@ -0,0 +1,6 @@
+p Click the button below to login
+
+form action="/auth/dex_energy" method="post"
+  input type="hidden" name="authenticity_token" value="#{session[:csrf]}"
+  input type="hidden" name="origin" value="#{request.referrer}"
+  input type="submit" value="Login"

data/lib/omniauth/strategies/dex_energy.rb

@@ -6,9 +6,13 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class DexEnergy < OmniAuth::Strategies::OAuth2
+      DEFAULT_SITE = 'https://who.dex.energy'
+
       option :name, 'dex_energy'
 
-      option :client_options, site: 'https://who.dex.energy', auth_scheme: :basic_auth
+      option :client_options, site: DEFAULT_SITE, auth_scheme: :basic_auth
+
+      option :authorize_params, scope: 'openid'
 
       uid do
         raw_info['sub']
@@ -26,6 +30,16 @@ module OmniAuth
         }
       end
 
+      class << self
+        def logout_uri(client_id:, redirect_uri:, site: nil)
+          site ||= DEFAULT_SITE
+
+          encoded_redirect_uri = URI.encode_www_form_component(redirect_uri)
+
+          "#{site}/oauth/logout?client_id=#{client_id}&redirect_uri=#{encoded_redirect_uri}"
+        end
+      end
+
       private
 
       def raw_info

data/omniauth-dex-energy.gemspec

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-gem_version = `git describe --exact-match HEAD`.strip
+gem_version = `git describe --tags --abbrev=0`.strip.sub(/^v/, '')
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 3.1'
   spec.name          = 'omniauth-dex-energy'
   spec.version       = gem_version
   spec.authors       = ['Cera Davies', 'Nick Burgin', 'Mike Williams']
@@ -28,14 +29,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/releases"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.add_dependency 'omniauth-oauth2', '~> 1.6'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'pry-byebug', '~> 3.8.0'
-  spec.add_development_dependency 'rack', '~> 1.6.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.77'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.37.0'
+  spec.add_dependency 'omniauth-oauth2', '~> 1.8'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-dex-energy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Cera Davies
 - Nick Burgin
 - Mike Williams
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -18,112 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.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'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.77'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.77'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.37.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: '1.8'
 description: an OmniAuth strategy for authenticating with deX
 email:
 - internalplatform@greensync.com.au
@@ -143,6 +45,7 @@ files:
 - examples/sinatra/proc/web
 - examples/sinatra/views/hello.slim
 - examples/sinatra/views/layout.slim
+- examples/sinatra/views/login.slim
 - lib/omniauth/strategies/dex_energy.rb
 - omniauth-dex-energy.gemspec
 homepage: https://github.com/greensync/omniauth-dex-energy
@@ -152,7 +55,8 @@ metadata:
   homepage_uri: https://github.com/greensync/omniauth-dex-energy
   source_code_uri: https://github.com/greensync/omniauth-dex-energy
   changelog_uri: https://github.com/greensync/omniauth-dex-energy/releases
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,15 +64,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: an OmniAuth strategy for authenticating with deX
 test_files: []