capcoauth 0.5.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 034c46acdc3cd67430792c484dccaffa490190b0
-  data.tar.gz: 9334e9e08a061613dd2d5a93efae5cb7f13d832f
+SHA256:
+  metadata.gz: b90a20b86a9c6be726eaead5e05718e42010926d2c669d5b5d5bed4c5be71c09
+  data.tar.gz: fbd13ea0046b2f11303a23a6011160686a11811273d98fc94cf20ba4ac1c237d
 SHA512:
-  metadata.gz: 24802981fe766eaf8c08f99fa141f2228b005eb47491706ba40eadbbd1bad81ee2ff0d9de22e86a934893aab2ef7be2207dad21c7576b215ab85cafc273efa6a
-  data.tar.gz: e0ab260d5a042d7c6e90e489a33411d3b2c090182eb3b2b60341d525dcc1ac0c1e0c523cd3bee634f4e3573b45a624a8d4ee73de70c9649cfb7eb1fbb9b58920
+  metadata.gz: 8f3d938fb7d9111e1d2b7e1950776fd15bef9c0b81c7186d570cd6835c6218a53db09bba6ec7f3222dde100844846da9ca623f813a71bd453e775d392158a695
+  data.tar.gz: b602d5bf798bf5b925432a46b58eb8a63953c656454972bb1fa8e4b315b4edcf4876b972cfc73932f6ea99ae27784f0faf4b880fa08631ac5d86915c76fb5806

data/.travis.yml

@@ -3,9 +3,11 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.3.8
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 
 before_install:
-  - gem install bundler -v '~> 1.10'
+  - gem install bundler -v '~> 2.0.2'

data/Gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.0'
+gem 'rails', '~> 5.2.6'
 
 gem 'simplecov', require: false, group: :test
 
 gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 gem 'sqlite3', platform: [:ruby, :mswin, :mingw, :x64_mingw]
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+
 gemspec

data/app/controllers/capcoauth/login_controller.rb

@@ -20,7 +20,12 @@ module Capcoauth
       end
 
       # Otherwise, redirect
-      redirect_to "#{Capcoauth.configuration.capcoauth_url}/oauth/authorize?client_id=#{Capcoauth.configuration.client_id}&redirect_uri=#{URI.encode(oauth_callback_url)}&response_type=code"
+      params = {
+        client_id: Capcoauth.configuration.client_id,
+        redirect_uri: oauth_callback_url,
+        response_type: 'code',
+      }
+      redirect_to "#{Capcoauth.configuration.capcoauth_url}/oauth/authorize?#{params.to_param}"
     end
   end
 end

data/capcoauth.gemspec

@@ -18,15 +18,13 @@ Gem::Specification.new do |s|
   
   s.required_ruby_version = '>= 2.1'
 
-  s.add_dependency 'railties', ['>= 4.2', '< 6.0']
+  s.add_dependency 'railties', ['>= 4.2', '< 7.0']
   s.add_dependency 'activesupport', '>= 3.0'
-  s.add_dependency 'httparty', '~> 0.14'
+  s.add_dependency 'httparty', '~> 0.17.3'
 
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'database_cleaner', '~> 1.5.3'
-  s.add_development_dependency 'factory_girl', '~> 4.7.0'
-  s.add_development_dependency 'generator_spec', '~> 0.9.3'
-  s.add_development_dependency 'rake', '>= 11.3.0'
+  s.add_development_dependency 'database_cleaner', '~> 1.7.0'
+  s.add_development_dependency 'generator_spec', '~> 0.9.4'
+  s.add_development_dependency 'rake', '>= 13.0.1'
   s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'timecop', '~> 0.8.1'
+  s.add_development_dependency 'timecop', '~> 0.9.1'
 end

data/lib/capcoauth/config.rb

@@ -20,7 +20,7 @@ module Capcoauth
 
   class Config
     CAPCOAUTH_URL_DEFAULT = 'https://capcoauth.capco.com'.freeze
-    TOKEN_VERIFY_TTL_DEFAULT = 10.freeze
+    TOKEN_VERIFY_TTL_DEFAULT = 60.freeze
 
     class Builder
       def initialize(&block)
@@ -35,6 +35,7 @@ module Capcoauth
         @config.user_id_field = :capcoauth
         @config.cache_store = ::ActiveSupport::Cache::MemoryStore.new
         @config.require_user = true
+        @config.send_notifications = false
 
         # Evaluate configuration block
         @config.instance_eval(&block)
@@ -53,7 +54,8 @@ module Capcoauth
                   :user_id_field,
                   :cache_store,
                   :user_resolver,
-                  :require_user
+                  :require_user,
+                  :send_notifications
 
     def client_id
       @client_id || raise(MissingRequiredOptionError, 'Missing required option `client_id`')

data/lib/capcoauth/engine.rb

@@ -1,7 +1,7 @@
 module Capcoauth
   class Engine < Rails::Engine
     initializer 'capcoauth.params.filter' do |app|
-      parameters = %w'code access_token'
+      parameters = %w(client_secret code authentication_token access_token refresh_token)
       app.config.filter_parameters << /^(#{Regexp.union parameters})$/
     end
 

data/lib/capcoauth/notifications.rb

@@ -33,8 +33,8 @@ module Capcoauth
 
       def default_headers
         {
-          'Authorization': "Bearer #{bearer_token}",
-          'Content-Type': 'application/vnd.api+json'
+          :'Authorization' => "Bearer #{bearer_token}",
+          :'Content-Type'=>'application/vnd.api+json'
         }
       end
 
@@ -77,6 +77,8 @@ module Capcoauth
       end
 
       def notify(user_id, alert=nil, badge=nil, data={})
+        return false unless Capcoauth.configuration.send_notifications
+
         data = JSON.generate data
         res = self.post(
           "#{Capcoauth.configuration.capcoauth_url}/api/v1/user_notifications",

data/lib/capcoauth/rails/helpers.rb

@@ -40,7 +40,7 @@ module Capcoauth
         raise Capcoauth::AuthorizationError, reason if error == :unauthorized_error
 
         # Raise an error if token has an ID but the user wasn't found
-        if Capcoauth.configuration.require_user and token.user_id.present? and current_user.blank?
+        if Capcoauth.configuration.require_user and token.present? and token.user_id.present? and current_user.blank?
           Capcoauth.configuration.logger.info "[CapcOAuth] Error looking up user: Token returned ID ##{token.user_id} but resolver didn't return user"
           raise Capcoauth::AuthorizationError, 'Your credentials were valid, but you aren\'t currently active in this system'
         end

data/lib/capcoauth/version.rb

@@ -5,8 +5,8 @@ module Capcoauth
 
   module VERSION
     MAJOR = 0
-    MINOR = 5
-    PATCH  = 0
+    MINOR = 6
+    PATCH  = 3
 
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")
   end

data/lib/generators/capcoauth/templates/initializer.rb

@@ -41,4 +41,7 @@ Capcoauth.configure do |config|
 
   # Don't redirect to last URL on login since we don't want to see API responses
   # config.perform_login_redirects = true
+
+  # Send push notifications (good to make this dependent on your environment)
+  # config.send_notifications = true
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+// Nothing

data/spec/dummy/config/application.rb

@@ -12,5 +12,7 @@ module Dummy
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
+
+    config.active_record.sqlite3.represent_boolean_as_integer = true
   end
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,6 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_key_base =
-  Dummy::Application.config.secret_token =
-  'c00157b5a1bb6181792f0f4a8a080485de7bab9987e6cf159dc74c4f0573345c1bfa713b5d756e1491fc0b098567e8a619e2f8d268eda86a20a720d05d633780'
+Dummy::Application.config.secret_key_base = 'c00157b5a1bb6181792f0f4a8a080485de7bab9987e6cf159dc74c4f0573345c1bfa713b5d756e1491fc0b098567e8a619e2f8d268eda86a20a720d05d633780'

data/spec/lib/config_spec.rb

@@ -119,11 +119,11 @@ describe Capcoauth::Config do
 
   describe 'using_routes' do
     it 'has value false by default' do
-      expect(subject.using_routes).to be_falsey
+      expect(subject.using_routes).to eq(false)
     end
     it 'can be updated to true' do
       subject.using_routes = true
-      expect(subject.using_routes).to be_truthy
+      expect(subject.using_routes).to eq(true)
       subject.using_routes = false
     end
     it 'is updated to true by Rails.application.routes.draw' do
@@ -132,17 +132,17 @@ describe Capcoauth::Config do
       Rails.application.routes.draw do
         use_capcoauth
       end
-      expect(subject.using_routes).to be_truthy
+      expect(subject.using_routes).to eq(true)
     end
   end
 
   describe 'perform_login_redirects' do
     it 'has value true by default' do
-      expect(subject.perform_login_redirects).to be_truthy
+      expect(subject.perform_login_redirects).to eq(true)
     end
     it 'can be updated to false' do
       subject.perform_login_redirects = false
-      expect(subject.perform_login_redirects).to be_falsey
+      expect(subject.perform_login_redirects).to eq(false)
       subject.perform_login_redirects = true
     end
   end
@@ -204,12 +204,24 @@ describe Capcoauth::Config do
 
   describe 'require_user' do
     it 'has value true by default' do
-      expect(subject.require_user).to be_truthy
+      expect(subject.require_user).to eq(true)
     end
     it 'can be updated to false' do
       subject.require_user = false
-      expect(subject.require_user).to be_falsey
+      expect(subject.require_user).to eq(false)
       subject.require_user = true
     end
   end
+
+  describe 'send_notifications' do
+    it 'has value false by default' do
+      expect(subject.send_notifications).to eq(false)
+    end
+    it 'can be updated to false' do
+      subject.send_notifications = false
+      expect(subject.send_notifications).to eq(false)
+      subject.send_notifications = true
+      expect(subject.send_notifications).to eq(true)
+    end
+  end
 end

data/spec/spec_helper_integration.rb

@@ -7,7 +7,6 @@ TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
-require 'capybara/rspec'
 require 'dummy/config/environment'
 require 'rspec/rails'
 require 'generator_spec/test_case'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capcoauth
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Adam Robertson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -50,84 +50,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.3.0
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.1
 description: capcoauth-gem is a library to integrate Rails applications with Capcoauth
   authentication service
 email:
@@ -168,7 +140,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -194,6 +165,7 @@ files:
 - lib/generators/capcoauth/templates/README
 - lib/generators/capcoauth/templates/initializer.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/full_protected_resources_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
@@ -240,7 +212,7 @@ homepage: https://github.com/arcreative/capcoauth-gem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -255,13 +227,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Integration with Capcoauth authentication service
 test_files:
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/full_protected_resources_controller.rb
 - spec/dummy/app/controllers/home_controller.rb