sorcery 0.16.2 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c616c0cfea97510b53d2383bb84dfa5fb7026681b8a0a55d762f60b2ad71505b
-  data.tar.gz: 07dc2d7787635cc92fea05896318fcf4602e59355ca3c092f448e44763b030d5
+  metadata.gz: ebeaecab44b52bef2e5f573c2fbf08e4e03d2f50ef96f3ce27a70002e145f50b
+  data.tar.gz: 5c9fb4fb3792b3a0b2700fd438c730328d769b4223daccd6f4fea36bdaad68c3
 SHA512:
-  metadata.gz: 45fe6636bfc0785eeaaf276a0d178eb75259c2daf9f8b4f19b26f246a80cd5297c2a931414b98d03df5bd9b4b71d0dad3bdd1a4ed44a2e1aa099988466bb7b43
-  data.tar.gz: b9695085f19f77a106c6e5e19eb6ead86e4068efc5ca0adb1909563d42397ee6fbfa6d061bd828eebbf558bd93a579b21a275f7a58a62c942c40f0ad04a2e214
+  metadata.gz: fed510d0cb545bb01bd1f9cdb7d6a79f129e977019355d41a1656d3f02f3130880d177e302b63a57f5e13ca1f15764bb3189f9e5df1aa20a9db58c4dd98dc551
+  data.tar.gz: 525e7f3f4ec290b71bfc7a39d2fa82a0213c7aaf99ce0005794eef266643a3db0dc105cb0580a766c7387375ff1633e26bb1506fd8389ed852c7f39451614dbc

data/.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-Please complete all sections.
+<!-- Please complete all sections. -->
 
 ### Configuration
 
@@ -9,12 +9,16 @@ Please complete all sections.
 
 ### Expected Behavior
 
-Tell us what should happen.
+<!-- Tell us what should happen. -->
 
 ### Actual Behavior
 
-Tell us what happens instead.
+<!-- Tell us what happens instead. -->
 
 ### Steps to Reproduce
 
-Please list all steps to reproduce the issue.
+<!-- Please list all steps to reproduce the issue. -->
+
+1.
+2.
+3.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -3,3 +3,5 @@ Please ensure your pull request includes the following:
 - [ ] Description of changes
 - [ ] Update to CHANGELOG.md with short description and link to pull request
 - [ ] Changes have related RSpec tests that ensure functionality does not break
+
+<!-- For the changelog, please add your entry to the HEAD section. Do not create a new release header. -->

data/.github/workflows/ruby.yml

@@ -1,7 +1,11 @@
 name: Test Suite
 
 # Run against all commits and pull requests.
-on: [ push, pull_request ]
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
 
 jobs:
   test_matrix:
@@ -16,17 +20,34 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
-          - 3.0
+          - 3.0.0
+          # - 3.1
 
         rails:
           - '52'
           - '60'
+          - '61'
+          # - '70'
 
         exclude:
           - ruby: 2.4
             rails: '60'
-          - ruby: 3.0
+          - ruby: 2.4
+            rails: '61'
+          # - ruby: 2.4
+          #   rails: '70'
+          # - ruby: 2.5
+          #   rails: '70'
+          # - ruby: 2.6
+          #   rails: '70'
+          - ruby: 3.0.0
             rails: '52'
+          # - ruby: 3.1
+          #   rails: '52'
+          # - ruby: 3.1
+          #   rails: '60'
+          # - ruby: 3.1
+          #   rails: '61'
 
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 ## HEAD
 
+## 0.16.4
+
+* Adapt to open request protection strategy of rails 7.0 [#318](https://github.com/Sorcery/sorcery/pull/318)
+* Update OAuth2 gem to v2 per v1 deprecation [#323](https://github.com/Sorcery/sorcery/pull/323)
+* Fixed typo in error message [#310](https://github.com/Sorcery/sorcery/pull/310)
+
+## 0.16.3
+
+* Fix provider instantiation for plural provider names (eg. okta) [#305](https://github.com/Sorcery/sorcery/pull/305)
+
 ## 0.16.2
 
 * Inline core migration index definition [#281](https://github.com/Sorcery/sorcery/pull/281)

data/MAINTAINING.md

@@ -0,0 +1,64 @@
+# Maintaining Sorcery
+
+This will eventually be fleshed out so that anyone should be able to pick up and
+maintain Sorcery by following this guide. It will provide step-by-step guides
+for common tasks such as releasing new versions, as well as explain how to
+triage issues and keep the CHANGELOG up-to-date.
+
+## Table of Contents
+
+1. [Merging Pull Requests](#merging-pull-requests)
+1. [Versioning](#versioning)
+   1. [Version Naming](#version-naming)
+   1. [Releasing a New Version](#releasing-a-new-version)
+
+## Merging Pull Requests
+
+TODO
+
+## Versioning
+
+### Version Naming
+
+Sorcery uses semantic versioning which can be found at: https://semver.org/
+
+All versions of Sorcery should follow this format: `MAJOR.MINOR.PATCH`
+
+Where:
+
+* MAJOR - Includes backwards **incompatible** changes.
+* MINOR - Introduces new functionality but is fully backwards compatible.
+* PATCH - Fixes errors in existing functionality (must be backwards compatible).
+
+The changelog and git tags should use `vMAJOR.MINOR.PATCH` to indicate that the
+number represents a version of Sorcery. For example, `1.0.0` would become
+`v1.0.0`.
+
+### Releasing a New Version
+
+When it's time to release a new version, you'll want to ensure all the changes
+you need are on the master branch and that there is a passing build. Then follow
+this checklist and prepare a release commit:
+
+NOTE: `X.Y.Z` and `vX.Y.Z` are given as examples, and should be replaced with
+      whatever version you are releasing. See: [Version Naming](#version-naming)
+
+1. Update CHANGELOG.md
+   1. Check for any changes that have been included since the last release that
+      are not reflected in the changelog. Add any missing entries to the `HEAD`
+      section.
+   1. Check the changes in `HEAD` to determine what version increment is
+      appropriate. See [Version Naming](#version-naming) if unsure.
+   1. Replace `## HEAD` with `## vX.Y.Z` and create a new `## HEAD` section
+      above the latest version.
+1. Update Gem Version
+   1. Update `./lib/sorcery/version.rb` to 'X.Y.Z'
+1. Stage your changes and create a commit
+   1. `git add -A`
+   1. `git commit -m "Release vX.Y.Z"`
+1. TODO: Gem Release (WIP)
+   1. `cd <dir>`
+   1. `gem build`
+   1. `gem push <filename>`
+1. TODO: Version tagging
+   1. Release new version via github interface

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1.0'
+gem 'rails-controller-testing'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '..'

data/gemfiles/rails_70.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.0.0'
+gem 'rails-controller-testing'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '..'

data/lib/sorcery/controller/submodules/external.rb

@@ -40,7 +40,7 @@ module Sorcery
                 providers.each do |name|
                   class_eval <<-RUBY, __FILE__, __LINE__ + 1
                     def self.#{name}
-                      @#{name} ||= Sorcery::Providers.const_get('#{name}'.to_s.classify).new
+                      @#{name} ||= Sorcery::Providers.const_get('#{name}'.to_s.camelcase).new
                     end
                   RUBY
                 end
@@ -118,7 +118,7 @@ module Sorcery
           # sends user to authenticate at the provider's website.
           # after authentication the user is redirected to the callback defined in the provider config
           def login_at(provider_name, args = {})
-            redirect_to sorcery_login_url(provider_name, args)
+            redirect_to sorcery_login_url(provider_name, args), allow_other_host: true
           end
 
           # tries to login the user from provider's callback

data/lib/sorcery/controller.rb

@@ -165,7 +165,7 @@ module Sorcery
       def user_class
         @user_class ||= Config.user_class.to_s.constantize
       rescue NameError
-        raise ArgumentError, 'You have incorrectly defined user_class or have forgotten to define it in intitializer file (config.user_class = \'User\').'
+        raise ArgumentError, 'You have incorrectly defined user_class or have forgotten to define it in the initializer file (config.user_class = \'User\').'
       end
     end
   end

data/lib/sorcery/version.rb

@@ -1,3 +1,3 @@
 module Sorcery
-  VERSION = '0.16.2'.freeze
+  VERSION = '0.16.4'.freeze
 end

data/sorcery.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'bcrypt', '~> 3.1'
   s.add_dependency 'oauth', '~> 0.5', '>= 0.5.5'
-  s.add_dependency 'oauth2', '~> 1.0', '>= 0.8.0'
+  s.add_dependency 'oauth2', '~> 2.0'
 
   s.add_development_dependency 'byebug', '~> 10.0.0'
   s.add_development_dependency 'rspec-rails', '~> 3.7.0'

data/spec/providers/examples_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'sorcery/providers/base'
+
+describe Sorcery::Providers::Examples do
+  before(:all) do
+    sorcery_reload!([:external])
+    sorcery_controller_property_set(:external_providers, [:examples])
+  end
+
+  context 'fetching a plural custom provider' do
+    it 'returns the provider' do
+      expect(Sorcery::Controller::Config.examples).to be_a(Sorcery::Providers::Examples)
+    end
+  end
+end

data/spec/support/providers/examples.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'sorcery/providers/base'
+
+module Sorcery
+  module Providers
+    class Examples < Base
+      include Protocols::Oauth2
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcery
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.4
 platform: ruby
 authors:
 - Noam Ben Ari
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -54,20 +54,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -207,11 +201,14 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.md
+- MAINTAINING.md
 - README.md
 - Rakefile
 - SECURITY.md
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
+- gemfiles/rails_70.gemfile
 - lib/generators/sorcery/USAGE
 - lib/generators/sorcery/helpers.rb
 - lib/generators/sorcery/install_generator.rb
@@ -304,6 +301,7 @@ files:
 - spec/orm/active_record.rb
 - spec/providers/example_provider_spec.rb
 - spec/providers/example_spec.rb
+- spec/providers/examples_spec.rb
 - spec/providers/vk_spec.rb
 - spec/rails_app/app/active_record/authentication.rb
 - spec/rails_app/app/active_record/user.rb
@@ -365,6 +363,7 @@ files:
 - spec/support/migration_helper.rb
 - spec/support/providers/example.rb
 - spec/support/providers/example_provider.rb
+- spec/support/providers/examples.rb
 homepage: https://github.com/Sorcery/sorcery
 licenses:
 - MIT
@@ -386,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Magical authentication for Rails applications