oauth2_provider 0.2.0 → 0.3.0

data/lib/oauth2/provider/url_parser.rb

@@ -0,0 +1,17 @@
+# Copyright (c) 2010 ThoughtWorks Inc. (http://thoughtworks.com)
+# Licenced under the MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+if RUBY_PLATFORM =~ /java/
+  module URIParser
+    module_function
+    def self.parse(url)
+      java.net.URL.new(url)
+    end
+  end
+
+  class java::net::URL
+    alias :scheme :protocol
+  end
+else
+  URIParser = URI
+end

data/lib/oauth2_provider.rb

@@ -5,15 +5,12 @@ require 'oauth2/provider/a_r_datasource'
 require 'oauth2/provider/in_memory_datasource'
 require 'oauth2/provider/model_base'
 require 'oauth2/provider/clock'
+require 'oauth2/provider/url_parser'
+require 'oauth2/provider/configuration'
+require 'ext/validatable_ext'
 
 Oauth2::Provider::ModelBase.datasource = ENV["OAUTH2_PROVIDER_DATASOURCE"]
 
-unless ENV['LOAD_OAUTH_SILENTLY']
-  puts "*"*80
-  puts "*** Using data source: #{Oauth2::Provider::ModelBase.datasource.class}"
-  puts "*"*80
-end
-
 Dir[File.join(File.dirname(__FILE__), "..", "app", "**", '*.rb')].each do |rb_file|
   require File.expand_path(rb_file)
 end

data/oauth2_provider.gemspec

@@ -2,27 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth2_provider}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ThoughtWorks, Inc."]
-  s.date = %q{2010-08-31}
+  s.date = %q{2011-03-16}
   s.description = %q{A Rails plugin to OAuth v2.0 enable your rails application. This plugin implements v09 of the OAuth2 draft spec http://tools.ietf.org/html/draft-ietf-oauth-v2-09.}
   s.email = %q{ketan@thoughtworks.com}
-  s.extra_rdoc_files = ["README.textile", "MIT-LICENSE.txt"]
-  s.files = ["app/controllers/oauth2/provider/oauth_authorize_controller.rb", "app/controllers/oauth2/provider/oauth_clients_controller.rb", "app/controllers/oauth2/provider/oauth_token_controller.rb", "app/controllers/oauth2/provider/oauth_user_tokens_controller.rb", "app/models/oauth2/provider/oauth_authorization.rb", "app/models/oauth2/provider/oauth_client.rb", "app/models/oauth2/provider/oauth_token.rb", "app/views/oauth2/provider/layouts/oauth_clients.html.erb", "app/views/oauth2/provider/oauth_authorize/index.html.erb", "app/views/oauth2/provider/oauth_clients/edit.html.erb", "app/views/oauth2/provider/oauth_clients/index.html.erb", "app/views/oauth2/provider/oauth_clients/new.html.erb", "app/views/oauth2/provider/oauth_clients/show.html.erb", "app/views/oauth2/provider/oauth_user_tokens/index.html.erb", "config/routes.rb", "generators/oauth2_provider/oauth2_provider_generator.rb", "generators/oauth2_provider/templates/config/initializers/oauth2_provider.rb", "generators/oauth2_provider/templates/db/migrate/create_oauth_authorizations.rb", "generators/oauth2_provider/templates/db/migrate/create_oauth_clients.rb", "generators/oauth2_provider/templates/db/migrate/create_oauth_tokens.rb", "init.rb", "lib/oauth2/provider/a_r_datasource.rb", "lib/oauth2/provider/application_controller_methods.rb", "lib/oauth2/provider/clock.rb", "lib/oauth2/provider/in_memory_datasource.rb", "lib/oauth2/provider/model_base.rb", "lib/oauth2_provider.rb", "MIT-LICENSE.txt", "oauth2_provider.gemspec", "README.textile", "tasks/gem.rake", "CHANGELOG"]
+  s.extra_rdoc_files = ["README.textile", "MIT-LICENSE.txt", "NOTICE.textile"]
+  s.files = ["app", "CHANGELOG", "config", "generators", "HACKING.textile", "init.rb", "lib", "MIT-LICENSE.txt", "NOTICE.textile", "oauth2_provider.gemspec", "README.textile", "WHAT_IS_OAUTH.textile", "app/controllers", "app/models", "app/views", "app/controllers/oauth_authorize_controller.rb", "app/controllers/oauth_clients_controller.rb", "app/controllers/oauth_token_controller.rb", "app/controllers/oauth_user_tokens_controller.rb", "app/models/oauth2", "app/models/oauth2/provider", "app/models/oauth2/provider/oauth_authorization.rb", "app/models/oauth2/provider/oauth_client.rb", "app/models/oauth2/provider/oauth_token.rb", "app/views/layouts", "app/views/oauth_authorize", "app/views/oauth_clients", "app/views/oauth_user_tokens", "app/views/layouts/oauth_clients.html.erb", "app/views/oauth_authorize/index.html.erb", "app/views/oauth_clients/_form.html.erb", "app/views/oauth_clients/edit.html.erb", "app/views/oauth_clients/index.html.erb", "app/views/oauth_clients/new.html.erb", "app/views/oauth_clients/show.html.erb", "app/views/oauth_user_tokens/index.html.erb", "config/routes.rb", "generators/oauth2_provider", "generators/oauth2_provider/oauth2_provider_generator.rb", "generators/oauth2_provider/templates", "generators/oauth2_provider/USAGE", "generators/oauth2_provider/templates/config", "generators/oauth2_provider/templates/db", "generators/oauth2_provider/templates/config/initializers", "generators/oauth2_provider/templates/config/initializers/oauth2_provider.rb", "generators/oauth2_provider/templates/db/migrate", "generators/oauth2_provider/templates/db/migrate/create_oauth_authorizations.rb", "generators/oauth2_provider/templates/db/migrate/create_oauth_clients.rb", "generators/oauth2_provider/templates/db/migrate/create_oauth_tokens.rb", "lib/ext", "lib/oauth2", "lib/oauth2_provider.rb", "lib/ext/validatable_ext.rb", "lib/oauth2/provider", "lib/oauth2/provider/a_r_datasource.rb", "lib/oauth2/provider/application_controller_methods.rb", "lib/oauth2/provider/clock.rb", "lib/oauth2/provider/configuration.rb", "lib/oauth2/provider/in_memory_datasource.rb", "lib/oauth2/provider/model_base.rb", "lib/oauth2/provider/ssl_helper.rb", "lib/oauth2/provider/transaction_helper.rb", "lib/oauth2/provider/url_parser.rb"]
   s.homepage = %q{http://github.com/ThoughtWorksStudios/oauth2_provider}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Rails plugin to OAuth v2.0 enable your rails application}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<validatable>, ["= 1.6.7"])
+      s.add_development_dependency(%q<saikuro_treemap>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, ["= 0.9.8"])
     else
+      s.add_dependency(%q<validatable>, ["= 1.6.7"])
+      s.add_dependency(%q<saikuro_treemap>, [">= 0"])
+      s.add_dependency(%q<rcov>, ["= 0.9.8"])
     end
   else
+    s.add_dependency(%q<validatable>, ["= 1.6.7"])
+    s.add_dependency(%q<saikuro_treemap>, [">= 0"])
+    s.add_dependency(%q<rcov>, ["= 0.9.8"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth2_provider
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - ThoughtWorks, Inc.
@@ -15,10 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: validatable
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 6
+        - 7
+        version: 1.6.7
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: saikuro_treemap
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id003
 description: A Rails plugin to OAuth v2.0 enable your rails application. This plugin implements v09 of the OAuth2 draft spec http://tools.ietf.org/html/draft-ietf-oauth-v2-09.
 email: ketan@thoughtworks.com
 executables: []
@@ -28,39 +73,49 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 - MIT-LICENSE.txt
+- NOTICE.textile
 files: 
-- app/controllers/oauth2/provider/oauth_authorize_controller.rb
-- app/controllers/oauth2/provider/oauth_clients_controller.rb
-- app/controllers/oauth2/provider/oauth_token_controller.rb
-- app/controllers/oauth2/provider/oauth_user_tokens_controller.rb
+- CHANGELOG
+- HACKING.textile
+- init.rb
+- MIT-LICENSE.txt
+- NOTICE.textile
+- oauth2_provider.gemspec
+- README.textile
+- WHAT_IS_OAUTH.textile
+- app/controllers/oauth_authorize_controller.rb
+- app/controllers/oauth_clients_controller.rb
+- app/controllers/oauth_token_controller.rb
+- app/controllers/oauth_user_tokens_controller.rb
 - app/models/oauth2/provider/oauth_authorization.rb
 - app/models/oauth2/provider/oauth_client.rb
 - app/models/oauth2/provider/oauth_token.rb
-- app/views/oauth2/provider/layouts/oauth_clients.html.erb
-- app/views/oauth2/provider/oauth_authorize/index.html.erb
-- app/views/oauth2/provider/oauth_clients/edit.html.erb
-- app/views/oauth2/provider/oauth_clients/index.html.erb
-- app/views/oauth2/provider/oauth_clients/new.html.erb
-- app/views/oauth2/provider/oauth_clients/show.html.erb
-- app/views/oauth2/provider/oauth_user_tokens/index.html.erb
+- app/views/layouts/oauth_clients.html.erb
+- app/views/oauth_authorize/index.html.erb
+- app/views/oauth_clients/_form.html.erb
+- app/views/oauth_clients/edit.html.erb
+- app/views/oauth_clients/index.html.erb
+- app/views/oauth_clients/new.html.erb
+- app/views/oauth_clients/show.html.erb
+- app/views/oauth_user_tokens/index.html.erb
 - config/routes.rb
 - generators/oauth2_provider/oauth2_provider_generator.rb
+- generators/oauth2_provider/USAGE
 - generators/oauth2_provider/templates/config/initializers/oauth2_provider.rb
 - generators/oauth2_provider/templates/db/migrate/create_oauth_authorizations.rb
 - generators/oauth2_provider/templates/db/migrate/create_oauth_clients.rb
 - generators/oauth2_provider/templates/db/migrate/create_oauth_tokens.rb
-- init.rb
+- lib/oauth2_provider.rb
+- lib/ext/validatable_ext.rb
 - lib/oauth2/provider/a_r_datasource.rb
 - lib/oauth2/provider/application_controller_methods.rb
 - lib/oauth2/provider/clock.rb
+- lib/oauth2/provider/configuration.rb
 - lib/oauth2/provider/in_memory_datasource.rb
 - lib/oauth2/provider/model_base.rb
-- lib/oauth2_provider.rb
-- MIT-LICENSE.txt
-- oauth2_provider.gemspec
-- README.textile
-- tasks/gem.rake
-- CHANGELOG
+- lib/oauth2/provider/ssl_helper.rb
+- lib/oauth2/provider/transaction_helper.rb
+- lib/oauth2/provider/url_parser.rb
 has_rdoc: true
 homepage: http://github.com/ThoughtWorksStudios/oauth2_provider
 licenses: []
@@ -91,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A Rails plugin to OAuth v2.0 enable your rails application

data/app/controllers/oauth2/provider/oauth_authorize_controller.rb

@@ -1,68 +0,0 @@
-# Copyright (c) 2010 ThoughtWorks Inc. (http://thoughtworks.com)
-# Licenced under the MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-module Oauth2
-  module Provider
-    class OauthAuthorizeController < ::ApplicationController
-      
-      def index
-        return unless validate_params
-      end
-  
-      def authorize
-        return unless validate_params
-    
-        unless params[:authorize] == '1'
-          redirect_to "#{params[:redirect_uri]}?error=access-denied"
-          return
-        end
-    
-        authorization = @client.create_authorization_for_user_id(current_user_id_for_oauth)
-        state_param = if params[:state].blank?
-          ""
-        else
-          "&state=#{CGI.escape(params[:state])}"
-        end
-        
-        redirect_to "#{params[:redirect_uri]}?code=#{authorization.code}&expires_in=#{authorization.expires_in}#{state_param}"
-      end
-  
-      private
-  
-      # TODO: support 'code', 'token', 'code-and-token'
-      VALID_RESPONSE_TYPES = ['code']
-  
-      def validate_params
-        if params[:client_id].blank? || params[:response_type].blank?
-          redirect_to "#{params[:redirect_uri]}?error=invalid-request"
-          return false
-        end
-    
-        unless VALID_RESPONSE_TYPES.include?(params[:response_type])
-          redirect_to "#{params[:redirect_uri]}?error=unsupported-response-type"
-          return
-        end
-    
-        if params[:redirect_uri].blank?
-          render :text => "You did not specify the 'redirect_uri' parameter!", :status => :bad_request
-          return false
-        end
-    
-        @client = OauthClient.find_one(:client_id, params[:client_id])
-    
-        if @client.nil?
-          redirect_to "#{params[:redirect_uri]}?error=invalid-client-id"
-          return false
-        end
-    
-        if @client.redirect_uri != params[:redirect_uri]
-          redirect_to "#{params[:redirect_uri]}?error=redirect-uri-mismatch"
-          return false
-        end
-    
-        true
-      end
-  
-    end
-  end
-end

data/app/controllers/oauth2/provider/oauth_clients_controller.rb

@@ -1,56 +0,0 @@
-# Copyright (c) 2010 ThoughtWorks Inc. (http://thoughtworks.com)
-# Licenced under the MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-module Oauth2
-  module Provider
-    class OauthClientsController < ApplicationController
-      
-      def index
-        @oauth_clients = OauthClient.all
-      end
-
-      def show
-        @oauth_client = OauthClient.find(params[:id])
-      end
-
-      def new
-        @oauth_client = OauthClient.new
-      end
-
-      def edit
-        @oauth_client = OauthClient.find(params[:id])
-      end
-
-      def create
-        @oauth_client = OauthClient.new(params[:oauth_client])
-        
-        if @oauth_client.save
-          flash[:notice] = 'OauthClient was successfully created.'
-          redirect_to :action => 'index'
-          return
-        else
-          render :action => "new" 
-        end
-      end
-
-      def update
-        @oauth_client = OauthClient.find(params[:id])
-
-        if @oauth_client.update_attributes(params[:oauth_client])
-          flash[:notice] = 'OauthClient was successfully updated.'
-          redirect_to :action => 'index'
-          return
-        else
-          render :action => "edit"
-        end
-      end
-
-      def destroy
-        @oauth_client = OauthClient.find(params[:id])
-        @oauth_client.destroy
-
-        redirect_to(oauth_clients_url)
-      end
-    end
-  end
-end

data/app/controllers/oauth2/provider/oauth_token_controller.rb

@@ -1,58 +0,0 @@
-# Copyright (c) 2010 ThoughtWorks Inc. (http://thoughtworks.com)
-# Licenced under the MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-module Oauth2
-  module Provider
-    class OauthTokenController < ApplicationController
-      skip_before_filter :verify_authenticity_token
-
-      def get_token
-        
-        authorization = OauthAuthorization.find_one(:code, params[:code])
-        authorization.destroy unless authorization.nil?
-        
-        original_token = OauthToken.find_one(:refresh_token, params[:refresh_token])
-        original_token.destroy unless original_token.nil?
-    
-        unless ['authorization-code', 'refresh-token'].include?(params[:grant_type])
-          render_error('unsupported-grant-type', "Grant type #{params[:grant_type]} is not supported!")
-          return
-        end
-    
-        client = OauthClient.find_one(:client_id, params[:client_id])
-
-        if client.nil? || client.client_secret != params[:client_secret]
-          render_error('invalid-client-credentials', 'Invalid client credentials!')
-          return
-        end
-    
-        if client.redirect_uri != params[:redirect_uri]
-          render_error('invalid-grant', 'Redirect uri mismatch!')
-          return
-        end
-    
-        if params[:grant_type] == 'authorization-code'
-          if authorization.nil? || authorization.expired? || authorization.oauth_client.id != client.id
-            render_error('invalid-grant', "Authorization expired or invalid!")
-            return
-          end
-          token = authorization.generate_access_token
-        else # refresh-token
-          if original_token.nil? || original_token.oauth_client.id != client.id
-            render_error('invalid-grant', 'Refresh token is invalid!')
-            return
-          end
-          token = original_token.refresh
-        end
-
-        render :content_type => 'application/json', :text => token.access_token_attributes.to_json
-      end
-  
-      private
-      def render_error(error_code, description)
-         render :status => :bad_request, :json => {:error => error_code, :error_description => description}.to_json
-      end
-  
-    end
-  end
-end

data/app/controllers/oauth2/provider/oauth_user_tokens_controller.rb

@@ -1,29 +0,0 @@
-# Copyright (c) 2010 ThoughtWorks Inc. (http://thoughtworks.com)
-# Licenced under the MIT License (http://www.opensource.org/licenses/mit-license.php)
-
-module Oauth2
-  module Provider
-    class OauthUserTokensController < ApplicationController
-      
-      def index
-        @tokens = OauthToken.find_all_with(:user_id, current_user_id_for_oauth)
-      end
-    
-      def revoke
-        token = OauthToken.find_by_id(params[:token_id])
-        if token.nil?
-          render :text => "User not authorized to perform this action!", :status => :bad_request
-          return
-        end
-        if token.user_id.to_s != current_user_id_for_oauth
-          render :text => "User not authorized to perform this action!", :status => :bad_request
-          return
-        end
-        
-        token.destroy
-        redirect_to :action => :index
-      end
-      
-    end
-  end
-end