vidibus-oauth2_server 0.0.3 → 0.0.4

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 gem "rails", "~> 3.0.0"
-gem "mongoid", "~> 2.0.0.beta.20"
+gem "mongoid", "~> 2.0.0"
 gem "vidibus-core_extensions", "~> 0.3.14"
 gem "vidibus-uuid"
 

data/README.rdoc

@@ -34,7 +34,7 @@ If you use the {Vidibus::Service}[https://github.com/vidibus/vidibus-service] ge
 
   # Returns true if given client_secret matches signature.
   def valid_oauth2_secret?(client_secret)
-    client_secret == Vidibus::Secure.sign("#{Service.this.url}#{uuid}", secret)
+    client_secret == Vidibus::Secure.sign(uuid, secret)
   end
 
 
@@ -121,20 +121,9 @@ This gem will also provide an action to obtain data of the user currently logged
 
   get "/oauth/user" => "oauth2/users#show"
 
-You may overwrite the Oauth2::UsersController class to adjust it to your needs. However, if you want to use the default controller, you'll need a method on your ApplicationController to obtain a user by a given UUID.
+You may overwrite the Oauth2::UsersController class to adjust it to your needs. However, if you want to use the default controller, you'll need a User model that responds to <t>:uuid</t>.
 
-For a typical ActiveRecord model this would be:
-
-  # Returns user matching given uuid
-  def find_user_by_uuid(uuid)
-    User.first(:conditions => {:uuid => uuid})
-  end
-
-The default #show method of this controller delivers a JSON string including name, email and UUID of the current user:
-
-  def show
-    render :json => @user.attributes.only(*%w[name email uuid])
-  end
+The default #show method of this controller delivers a JSON of attributes returned by User#oauth_attribute. If no such method exist, the response will include name, email and UUID of the current user.
 
 == And the client side?
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/app/controllers/oauth2/authentication_controller.rb

@@ -29,7 +29,7 @@ class Oauth2::AuthenticationController < Oauth2Controller
 
   # Ensures that the type of flow is supported
   def validate_oauth2_type!
-    type = params[:type]
+    type = params[:type] || params[:response_type] || params[:grant_type]
     raise Vidibus::Oauth2Server::MissingTypeError if type.blank?
     raise Vidibus::Oauth2Server::UnsupportedTypeError unless Vidibus::Oauth2Server::FLOWS.include?(type)
   end

data/app/controllers/oauth2/users_controller.rb

@@ -3,16 +3,20 @@ class Oauth2::UsersController < Oauth2Controller
   before_filter :find_user
 
   def show
-    render :json => @user.attributes.only(*%w[name email uuid])
+    attributes = @user.try!(:oauth_attributes) || @user.attributes.only(*%w[name email uuid])
+    render :json => attributes
   end
 
   protected
 
   def find_user
-    @user = find_user_by_uuid(@access_token.user_id) or render(:nothing => true, :status => :bad_request)
+    @user = User.where(:uuid => @access_token.user_id).first or render(:nothing => true, :status => :bad_request)
   end
 
   def ensure_token!
-    @access_token = Oauth2Token.find!(:token => params[:access_token])
+    unless token = params[:access_token] || params[:oauth_token]
+      raise Vidibus::Oauth2Server::MissingTokenError
+    end
+    @access_token = Oauth2Token.find!(:token => token)
   end
 end

data/app/models/oauth2_token.rb

@@ -7,12 +7,12 @@ class Oauth2Token
   CODE_EXPIRY = 60 # Lifetime of token authorization code in seconds.
   TOKEN_EXPIRY = 0 # Lifetime of token in seconds. 0 will never expire token.
 
-  field :client_id
-  field :user_id
-  field :redirect_url
-  field :token
-  field :secret
-  field :code
+  field :client_id, :type => String
+  field :user_id, :type => String
+  field :redirect_url, :type => String
+  field :token, :type => String
+  field :secret, :type => String
+  field :code, :type => String
 
   field :code_expires_at, :type => Time
   field :token_expires_at, :type => Time

data/config/locales/de.yml

@@ -0,0 +1,16 @@
+de:
+  oauth2_server:
+    errors:
+      missing_type: "Der Parameter '*_type' fehlt. Bitte gib den Typ des OAuth-Flows an."
+      unsupported_type: "Der Wert des Parameters '*_type' ist ungültig. Dieser OAuth-Flow wird nicht unterstützt."
+      missing_client_id: "Der Parameter 'client_id' fehlt. Bitte gib die ID der Anwendung an."
+      invalid_client_id: "Der Parameter 'client_id' ist ungültig. Bitte gib die gültige ID der Anwendung an."
+      invalid_client_secret: "Der Parameter 'client_secret' ist ungültig. Bitte gib das gültige Passwort der Anwendung an."
+      missing_redirect_url: "Der Parameter 'redirect_url' fehlt. Bitte gib eine URL an, zu der umgeleitet werden soll."
+      malformed_redirect_url: "Der Parameter 'redirect_url' hat ein ungültiges Format. Bitte gib eine gültige URL an, zu der umgeleitet werden soll."
+      invalid_redirect_url: "Der Parameter 'redirect_url' is ungültig. Er muss zu der URL des anfragenden Services passen. Bitte gib eine gültige URL an, zu der umgeleitet werden soll."
+      missing_code: "Der Parameter 'code' fehlt. Bitte gib einen Code zur Abfrage des OAuth-Tokens an."
+      invalid_code: "Der Parameter 'code' ist ungültig. Bitte gib einen gültigen Code zur Abfrage des OAuth-Tokens an."
+      expired_code: "Der Parameter 'code' ist ungültig. Der angegebene Code zur Abfrage des OAuth-Tokens ist abgelaufen."
+      invalid_token: "Der Parameter 'token' ist ungültig. Bitte gib ein gültiges OAuth-Token zur Autorisierung an."
+      expired_token: "Der Parameter 'token' ist ungültig. Das angegebene OAuth-Token ist abgelaufen."

data/config/locales/en.yml

@@ -1,8 +1,8 @@
 en:
   oauth2_server:
     errors:
-      missing_type: "Parameter 'type' is missing. Please provide the type of OAuth flow to apply."
-      unsupported_type: "Parameter 'type' has an supported value. This type of OAuth flow is not supported by this server."
+      missing_type: "Parameter '*_type' is missing. Please provide the type of OAuth flow to apply."
+      unsupported_type: "Parameter '*_type' has an supported value. This type of OAuth flow is not supported by this server."
       missing_client_id: "Parameter 'client_id' is missing. Please provide the key of the requesting client application."
       invalid_client_id: "Parameter 'client_id' is invalid. Please provide the key of a valid client application."
       invalid_client_secret: "Parameter 'client_secret' is invalid. Please provide the secret of given client application."

data/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   get "/oauth/authorize" => "oauth2/authentication#authorize"
-  post "/oauth/access_token" => "oauth2/authentication#access_token"
+  match "/oauth/access_token" => "oauth2/authentication#access_token", :via => [:get, :post]
+  match "/oauth/oauth_token" => "oauth2/authentication#access_token", :via => [:get, :post]
   get "/oauth/user" => "oauth2/users#show"
 end

data/lib/vidibus/oauth2_server.rb

@@ -20,6 +20,6 @@ module Vidibus
     class InvalidTokenError < Oauth2ServerError; end
     class ExpiredTokenError < Oauth2ServerError; end
 
-    FLOWS = %w[web_server]
+    FLOWS = %w[web_server code authorization_code]
   end
 end

data/vidibus-oauth2_server.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-oauth2_server}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-05-04}
   s.description = %q{OAuth2 server for Rails 3 with Mongoid.}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -28,6 +27,7 @@ Gem::Specification.new do |s|
     "app/controllers/oauth2/users_controller.rb",
     "app/controllers/oauth2_controller.rb",
     "app/models/oauth2_token.rb",
+    "config/locales/de.yml",
     "config/locales/en.yml",
     "config/routes.rb",
     "lib/vidibus-oauth2_server.rb",
@@ -38,16 +38,15 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/vidibus/vidibus-oauth2_server}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{OAuth2 server for Rails 3 with Mongoid.}
 
   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
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta.20"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0"])
       s.add_runtime_dependency(%q<vidibus-core_extensions>, ["~> 0.3.14"])
       s.add_runtime_dependency(%q<vidibus-uuid>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -58,7 +57,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webmock>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.20"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
       s.add_dependency(%q<vidibus-core_extensions>, ["~> 0.3.14"])
       s.add_dependency(%q<vidibus-uuid>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -70,7 +69,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.20"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0.0"])
     s.add_dependency(%q<vidibus-core_extensions>, ["~> 0.3.14"])
     s.add_dependency(%q<vidibus-uuid>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-oauth2_server
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,30 +32,28 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id001
+  name: rails
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mongoid
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
-  requirement: *id002
+        version: 2.0.0
+  name: mongoid
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: vidibus-core_extensions
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,12 +64,12 @@ dependencies:
         - 3
         - 14
         version: 0.3.14
-  requirement: *id003
+  name: vidibus-core_extensions
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: vidibus-uuid
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +78,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  name: vidibus-uuid
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +92,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  name: jeweler
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rake
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,12 +106,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: rake
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,12 +124,12 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
-  requirement: *id007
+  name: rspec
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rr
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,12 +138,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  name: rr
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: relevance-rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,12 +152,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  name: relevance-rcov
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: webmock
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -169,7 +166,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  name: webmock
+  version_requirements: *id010
 description: OAuth2 server for Rails 3 with Mongoid.
 email: andre@vidibus.com
 executables: []
@@ -182,7 +180,6 @@ extra_rdoc_files:
 files: 
 - .document
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -191,6 +188,7 @@ files:
 - app/controllers/oauth2/users_controller.rb
 - app/controllers/oauth2_controller.rb
 - app/models/oauth2_token.rb
+- config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
 - lib/vidibus-oauth2_server.rb
@@ -228,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: OAuth2 server for Rails 3 with Mongoid.

data/Gemfile.lock

@@ -1,123 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    addressable (2.2.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bson (1.0.9)
-    builder (2.1.2)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    macaddr (1.0.0)
-    mail (2.2.6.1)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
-    mongo (1.0.9)
-      bson (>= 1.0.5)
-    mongoid (2.0.0.beta.19)
-      activemodel (~> 3.0)
-      mongo (= 1.0.9)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    relevance-rcov (0.9.2.1)
-    rr (1.0.0)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    thor (0.14.2)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-    uuid (2.3.1)
-      macaddr (~> 1.0)
-    vidibus-core_extensions (0.3.14)
-    vidibus-uuid (0.3.8)
-      mongoid (~> 2.0.0.beta.20)
-      uuid (~> 2.3.1)
-    webmock (1.3.5)
-      addressable (>= 2.1.1)
-      crack (>= 0.1.7)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler
-  mongoid (~> 2.0.0.beta.20)
-  rails (~> 3.0.0)
-  rake
-  relevance-rcov
-  rr
-  rspec (~> 2.0.0.beta.20)
-  vidibus-core_extensions
-  vidibus-uuid
-  webmock