Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

## [v4.1.1]

### Fixed

- Fix requiring of oauth2 to avoid `NoMethodError: undefined method 'config' for module OAuth2` (#86)

## [v4.1.0]

### Added
Expand Down Expand Up @@ -140,7 +146,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- rails model concern to allow host app to add auth behaviour to a model
- callback, logout and failure routes to handle auth

[Unreleased]: https://github.com/RaspberryPiFoundation/rpi-auth/compare/v4.1.0...HEAD
[Unreleased]: https://github.com/RaspberryPiFoundation/rpi-auth/compare/v4.1.1...HEAD
[v4.1.1]: https://github.com/RaspberryPiFoundation/rpi-auth/releases/tag/v4.1.1
[v4.1.0]: https://github.com/RaspberryPiFoundation/rpi-auth/releases/tag/v4.1.0
[v4.0.0]: https://github.com/RaspberryPiFoundation/rpi-auth/releases/tag/v4.0.0
[v3.6.0]: https://github.com/RaspberryPiFoundation/rpi-auth/releases/tag/v3.6.0
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6.1.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
rpi_auth (4.1.0)
rpi_auth (4.1.1)
oauth2
omniauth-rails_csrf_protection (~> 1.0.0)
omniauth_openid_connect (~> 0.7.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.0.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
rpi_auth (4.1.0)
rpi_auth (4.1.1)
oauth2
omniauth-rails_csrf_protection (~> 1.0.0)
omniauth_openid_connect (~> 0.7.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.1.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
rpi_auth (4.1.0)
rpi_auth (4.1.1)
oauth2
omniauth-rails_csrf_protection (~> 1.0.0)
omniauth_openid_connect (~> 0.7.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.2.gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
rpi_auth (4.1.0)
rpi_auth (4.1.1)
oauth2
omniauth-rails_csrf_protection (~> 1.0.0)
omniauth_openid_connect (~> 0.7.1)
Expand Down
2 changes: 1 addition & 1 deletion lib/rpi_auth/controllers/auto_refreshing_token.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'oauth2/error'
require 'oauth2'

module RpiAuth
module Controllers
Expand Down
3 changes: 1 addition & 2 deletions lib/rpi_auth/oauth_client.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# frozen_string_literal: true

require 'oauth2/client'
require 'oauth2/access_token'
require 'oauth2'

module RpiAuth
class OauthClient
Expand Down
2 changes: 1 addition & 1 deletion lib/rpi_auth/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module RpiAuth
VERSION = '4.1.0'
VERSION = '4.1.1'
end
2 changes: 1 addition & 1 deletion spec/dummy/spec/requests/refresh_credentials_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'spec_helper'

require 'oauth2/error'
require 'oauth2'

RSpec.describe 'Refreshing the auth token', type: :request do
include ActiveSupport::Testing::TimeHelpers
Expand Down
1 change: 0 additions & 1 deletion spec/rpi_auth/oauth_client_spec.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# frozen_string_literal: true

require 'spec_helper'
require 'oauth2'

RSpec.describe RpiAuth::OauthClient do
include ActiveSupport::Testing::TimeHelpers
Expand Down