simple_oauth2 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7457463729d7d0b17d67f13e8f0865f8340d8e59
-  data.tar.gz: 85c2c6a42f9085f0636c4fca5e72339b542c7a48
+  metadata.gz: c571e4fa9cd993df75fdb5416df55c386bc97503
+  data.tar.gz: e994bccde3012073687e723ec829ccb9e6453569
 SHA512:
-  metadata.gz: 5e0ff90478bd45cd417ef769086b492252375fcefdea551d7f853df51096c3513be1b399322f70ade0392a7a3c9cd9acc3ff05a969b9fc647acc15d859a47b0c
-  data.tar.gz: 4575200800986eac07b0bae126b44a144cbd5ebc5ff7a2cecec0da2eedba32b055e1f62445c90b3b79bd7fe16c76ad24df83190924ef9a04b86587ef45c09b14
+  metadata.gz: 83368b14042af9aa05107cb83a55e333f3c71d1aeb6a3669e9a9b65160a5ddb50bc310d2b1ee63cebb1deb684ab38f09849b5c00740b0ba54ece10170476d1ec
+  data.tar.gz: 8b6cc5aec58182a68cfaecc34de807986b82dab2be4bbae905bc050f20827d7319fd9291738daff0efa34989f4027b0f06fd715b2c02938c2c2d7b9d3a640535

data/.travis.yml

@@ -21,11 +21,5 @@ matrix:
     - rvm: ruby-head
   include:
   - rvm: 2.2.6
-    gemfile: gemfiles/nobrainer.rb
-    env: ORM=nobrainer
   - rvm: 2.3.3
-    gemfile: gemfiles/nobrainer.rb
-    env: ORM=nobrainer
   - rvm: ruby-head
-    gemfile: gemfiles/nobrainer.rb
-    env: ORM=nobrainer

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rack-oauth2'
 
 group :test do
   gem 'nobrainer'
+  gem 'nobrainer_simple_oauth2'
 
   gem 'coveralls', require: false
   gem 'ffaker'

data/lib/simple_oauth2.rb

@@ -7,13 +7,6 @@ require 'simple_oauth2/scopes'
 require 'simple_oauth2/uniq_token'
 require 'simple_oauth2/resource/bearer'
 
-# Mixins
-if defined?(NoBrainer::Document)
-  require 'simple_oauth2/mixins/nobrainer/access_token'
-  require 'simple_oauth2/mixins/nobrainer/access_grant'
-  require 'simple_oauth2/mixins/nobrainer/client'
-end
-
 # Authorization Grants aka Flows (Strategies)
 require 'simple_oauth2/strategies/base'
 require 'simple_oauth2/strategies/password'

data/lib/simple_oauth2/configuration.rb

@@ -113,7 +113,7 @@ module Simple
       # Validates token value passed with the request params
       def default_token_authenticator
         lambda do |request|
-          access_token_class.authenticate(request.access_token) || request.invalid_token!
+          access_token_class.by_token(request.access_token) || request.invalid_token!
         end
       end
 

data/lib/simple_oauth2/generators/token.rb

@@ -28,7 +28,7 @@ module Simple
           # @return [Response] with HTTP status code 200
           #
           def revoke(token, env)
-            access_token = config.access_token_class.authenticate(token, 'refresh_token')
+            access_token = config.access_token_class.by_refresh_token(token)
 
             if access_token
               request = Rack::OAuth2::Server::Token::Request.new(env)

data/lib/simple_oauth2/strategies/base.rb

@@ -8,7 +8,7 @@ module Simple
         class << self
           # Authenticates Client from the request
           def authenticate_client(request)
-            config.client_class.authenticate(request.client_id)
+            config.client_class.by_key(request.client_id)
           end
 
           # Authenticates Resource Owner from the request
@@ -22,7 +22,7 @@ module Simple
 
           # Authenticates Access Grant from the request
           def authenticate_access_grant(request)
-            config.access_grant_class.authenticate(request.code)
+            config.access_grant_class.by_token(request.code)
           end
 
           # Exposes token object to Bearer token.

data/lib/simple_oauth2/strategies/refresh_token.rb

@@ -22,7 +22,7 @@ module Simple
 
           # Check refresh token and client id for exact matching verifier
           def verify_refresh_token!(request, client_id)
-            refresh_token = config.access_token_class.authenticate(request.refresh_token, 'refresh_token')
+            refresh_token = config.access_token_class.by_refresh_token(request.refresh_token)
             refresh_token || request.invalid_grant!
             refresh_token.client_id == client_id || request.unauthorized_client!
 

data/lib/simple_oauth2/version.rb

@@ -14,7 +14,7 @@ module Simple
       # Level changes for implementation level detail changes, such as small bug fixes
       PATCH = 0
       # Level changes for any backwards compatible API changes, such as new functionality/features
-      MINOR = 0
+      MINOR = 1
       # Level changes for backwards incompatible API changes,
       # such as changes that will break existing users code if they update
       MAJOR = 0

data/spec/configuration/config_spec.rb

@@ -4,7 +4,7 @@ describe Simple::OAuth2::Configuration do
   let(:config) { described_class.new }
 
   class CustomClient
-    def self.authenticate(_key, _secret = nil)
+    def self.by_key(_key)
       'Test'
     end
   end
@@ -12,7 +12,11 @@ describe Simple::OAuth2::Configuration do
   class CustomAccessToken
     def self.create_for(_client, _resource_owner, _scopes = nil); end
 
-    def self.authenticate(_token, _type = nil)
+    def self.by_token(_token)
+      'Test'
+    end
+
+    def self.by_refresh_token(_refresh_token)
       'Test'
     end
 
@@ -105,11 +109,11 @@ describe Simple::OAuth2::Configuration do
     end
 
     context 'works with custom Access Token class' do
-      it { expect(config.access_token_class.authenticate('')).to eq('Test') }
+      it { expect(config.access_token_class.by_token('')).to eq('Test') }
     end
 
     context 'works with custom Client class' do
-      it { expect(config.client_class.authenticate('')).to eq('Test') }
+      it { expect(config.client_class.by_key('')).to eq('Test') }
     end
 
     context 'works with custom Resource Owner class' do

data/spec/dummy/orm/nobrainer/app/models/access_grant.rb

@@ -1,3 +1,3 @@
 class AccessGrant
-  include Simple::OAuth2::NoBrainer::AccessGrant
+  include NoBrainer::Simple::OAuth2::AccessGrant
 end

data/spec/dummy/orm/nobrainer/app/models/access_token.rb

@@ -1,3 +1,3 @@
 class AccessToken
-  include Simple::OAuth2::NoBrainer::AccessToken
+  include NoBrainer::Simple::OAuth2::AccessToken
 end

data/spec/dummy/orm/nobrainer/app/models/client.rb

@@ -1,3 +1,3 @@
 class Client
-  include Simple::OAuth2::NoBrainer::Client
+  include NoBrainer::Simple::OAuth2::Client
 end

data/spec/dummy/orm/nobrainer/app/models/user.rb

@@ -1,11 +1,3 @@
 class User
-  include NoBrainer::Document
-
-  field :username, type: String, index: true
-  field :encrypted_password, type: String
-
-  def self.oauth_authenticate(_client, username, password)
-    user = where(username: username.to_s).first
-    user if user && user.encrypted_password == password
-  end
+  include NoBrainer::Simple::OAuth2::ResourceOwner
 end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ end
 
 require 'rack/test'
 require 'ffaker'
+require 'nobrainer_simple_oauth2'
 require ORM_GEMS_MAPPING[ENV['ORM']]
 require File.expand_path("../dummy/orm/#{ENV['ORM']}/app/twitter", __FILE__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Volodimir Partytskyi
@@ -47,7 +47,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/nobrainer.rb
 - lib/simple_oauth2.rb
 - lib/simple_oauth2/configuration.rb
 - lib/simple_oauth2/configuration/class_accessors.rb
@@ -56,9 +55,6 @@ files:
 - lib/simple_oauth2/generators/base.rb
 - lib/simple_oauth2/generators/token.rb
 - lib/simple_oauth2/helpers.rb
-- lib/simple_oauth2/mixins/nobrainer/access_grant.rb
-- lib/simple_oauth2/mixins/nobrainer/access_token.rb
-- lib/simple_oauth2/mixins/nobrainer/client.rb
 - lib/simple_oauth2/resource/bearer.rb
 - lib/simple_oauth2/responses.rb
 - lib/simple_oauth2/scopes.rb

data/gemfiles/nobrainer.rb

@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'nobrainer'
-
-group :test do
-  gem 'coveralls', require: false
-  gem 'factory_girl', '~> 4.0'
-  gem 'ffaker'
-  gem 'rack-test', require: 'rack/test'
-  gem 'rspec-rails', '~> 3.4'
-end
-
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

data/lib/simple_oauth2/mixins/nobrainer/access_grant.rb

@@ -1,62 +0,0 @@
-module Simple
-  module OAuth2
-    module NoBrainer
-      # Includes all the required API, associations, validations and callbacks
-      module AccessGrant
-        extend ActiveSupport::Concern
-
-        included do # rubocop:disable Metrics/BlockLength
-          include ::NoBrainer::Document
-          include ::NoBrainer::Document::Timestamps
-
-          belongs_to :client, class_name: Simple::OAuth2.config.client_class_name,
-                              foreign_key: :client_id, primary_key: :id
-          belongs_to :resource_owner, class_name: Simple::OAuth2.config.resource_owner_class_name,
-                                      foreign_key: :resource_owner_id, primary_key: :id
-
-          before_save { self.updated_at = Time.now }
-          before_validation :setup_expiration, if: :new_record?
-
-          field :resource_owner_id, type: String, index: true, required: true
-          field :client_id,         type: String, index: true, required: true
-
-          field :token,
-                type: String,
-                required: true,
-                uniq: true,
-                index: true,
-                default: -> { Simple::OAuth2.config.token_generator.generate }
-
-          field :redirect_uri, type: String, required: true
-          field :scopes,       type: String
-
-          field :revoked_at, type: Time
-          field :expires_at, type: Time, required: true
-          field :created_at, type: Time, required: true, default: -> { Time.now }
-          field :updated_at, type: Time, required: true, default: -> { Time.now }
-
-          class << self
-            def create_for(client, resource_owner, redirect_uri, scopes = nil)
-              create(
-                client_id: client.id,
-                resource_owner_id: resource_owner.id,
-                redirect_uri: redirect_uri,
-                scopes: scopes
-              )
-            end
-
-            def authenticate(token)
-              where(token: token.to_s).first
-            end
-          end
-
-          private
-
-          def setup_expiration
-            self.expires_at = Time.now.utc + Simple::OAuth2.config.authorization_code_lifetime if expires_at.nil?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/simple_oauth2/mixins/nobrainer/access_token.rb

@@ -1,98 +0,0 @@
-module Simple
-  module OAuth2
-    module NoBrainer
-      # Includes all the required API, associations, validations and callbacks
-      module AccessToken
-        extend ActiveSupport::Concern
-
-        included do # rubocop:disable Metrics/BlockLength
-          include ::NoBrainer::Document
-          include ::NoBrainer::Document::Timestamps
-
-          before_save { self.updated_at = Time.now }
-          before_validation :setup_expiration, if: :new_record?
-
-          belongs_to :client, class_name: Simple::OAuth2.config.client_class_name,
-                              foreign_key: :client_id, primary_key: :id
-          belongs_to :resource_owner, class_name: Simple::OAuth2.config.resource_owner_class_name,
-                                      foreign_key: :resource_owner_id, primary_key: :id
-
-          field :resource_owner_id, type: String, index: true, required: true
-          field :client_id,         type: String, index: true, required: true
-          field :token,
-                type: String,
-                index: true,
-                required: true,
-                uniq: true,
-                default: -> { Simple::OAuth2.config.token_generator.generate }
-          field :refresh_token,
-                type: String,
-                index: true,
-                uniq: true,
-                default: -> do
-                  if Simple::OAuth2.config.issue_refresh_token
-                    Simple::OAuth2.config.token_generator.generate
-                  else
-                    ''
-                  end
-                end
-
-          field :scopes,     type: String
-
-          field :revoked_at, type: Time
-          field :expires_at, type: Time, required: true
-          field :created_at, type: Time, required: true, default: -> { Time.now }
-          field :updated_at, type: Time, required: true, default: -> { Time.now }
-
-          class << self
-            def create_for(client, resource_owner, scopes = nil)
-              create(
-                client_id: client.id,
-                resource_owner_id: resource_owner.id,
-                scopes: scopes
-              )
-            end
-
-            def authenticate(token, token_type_hint = nil)
-              return if token.blank?
-
-              if token_type_hint == 'refresh_token'
-                where(refresh_token: token).first
-              else
-                where(token: token).first
-              end
-            end
-          end
-
-          def expired?
-            expires_at && Time.now.utc > expires_at
-          end
-
-          def revoked?
-            revoked_at && revoked_at <= Time.now.utc
-          end
-
-          def revoke!(revoked_at = Time.now.utc)
-            update!(revoked_at: revoked_at)
-          end
-
-          def to_bearer_token
-            {
-              access_token: token,
-              expires_in: expires_at && Simple::OAuth2.config.access_token_lifetime.to_i,
-              refresh_token: refresh_token,
-              scope: scopes
-            }
-          end
-
-          private
-
-          def setup_expiration
-            expires_in = Simple::OAuth2.config.access_token_lifetime.to_i
-            self.expires_at = Time.now.utc + expires_in if expires_at.nil? && !expires_in.nil?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/simple_oauth2/mixins/nobrainer/client.rb

@@ -1,43 +0,0 @@
-module Simple
-  module OAuth2
-    module NoBrainer
-      # Includes all the required API, associations, validations and callbacks
-      module Client
-        extend ActiveSupport::Concern
-
-        included do
-          include ::NoBrainer::Document
-          include ::NoBrainer::Document::Timestamps
-
-          before_save { self.updated_at = Time.now }
-
-          has_many :access_tokens, class_name: Simple::OAuth2.config.access_token_class_name, foreign_key: :client_id
-          has_many :access_grants, class_name: Simple::OAuth2.config.access_grant_class_name, foreign_key: :client_id
-
-          field :name,         type: String, required: true
-          field :redirect_uri, type: String, required: true
-
-          field :key,
-                type: String,
-                required: true,
-                index: true,
-                uniq: true,
-                default: -> { Simple::OAuth2.config.token_generator.generate }
-          field :secret,
-                type: String,
-                required: true,
-                index: true,
-                uniq: true,
-                default: -> { Simple::OAuth2.config.token_generator.generate }
-
-          field :created_at, type: Time, required: true, default: -> { Time.now }
-          field :updated_at, type: Time, required: true, default: -> { Time.now }
-
-          def self.authenticate(key)
-            where(key: key.to_s).first
-          end
-        end
-      end
-    end
-  end
-end