doorkeeper 1.0.0 → 1.1.0

data/app/views/doorkeeper/applications/show.html.erb

@@ -1,28 +1,38 @@
-<div class="span16">
-  <header class="page-header">
-    <h1>Application: <%= @application.name %></h1>
-  </header>
+<div class="page-header">
+  <h1>Application: <%= @application.name %></h1>
 </div>
 
-<div class="span10">
-  <h4>Callback urls:</h4>
-  <p id="callback_url">
-    <% @application.redirect_uri.split.each do |uri| %><code><%= uri %></code> <% end %>
-  </p>
+<div class="row">
+  <div class="col-md-8">
+    <h4>Application Id:</h4>
 
-  <h4>Application Id:</h4>
-  <p><code id="application_id"><%= @application.uid %></code></p>
+    <p><code id="application_id"><%= @application.uid %></code></p>
 
-  <h4>Secret:</h4>
-  <p><code id="secret"><%= @application.secret %></code></p>
+    <h4>Secret:</h4>
 
-  <h4>Link to authorization code:</h4>
-  <p><%= link_to 'Authorize', oauth_authorization_path(:client_id => @application.uid, :redirect_uri => @application.redirect_uri, :response_type => 'code' ) %></p>
-</div>
+    <p><code id="secret"><%= @application.secret %></code></p>
+
+    <h4>Callback urls:</h4>
+
+    <table>
+      <% @application.redirect_uri.split.each do |uri| %>
+        <tr>
+          <td>
+            <code><%= uri %></code>
+          </td>
+          <td>
+            <%= link_to 'Authorize', oauth_authorization_path(:client_id => @application.uid, :redirect_uri => uri, :response_type => 'code'), class: 'btn btn-success', target: '_blank' %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+
+  <div class="col-md-4">
+    <h3>Actions</h3>
+
+    <p><%= link_to 'Edit', edit_oauth_application_path(@application), class: 'btn btn-primary' %></p>
 
-<div class="span6">
-  <h3>Actions</h3>
-  <p><%= link_to 'List all', oauth_applications_path %></p>
-  <p><%= link_to 'Edit', edit_oauth_application_path(@application) %></p>
-  <p><%= render 'delete_form', application: @application %></p>
+    <p><%= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger' %></p>
+  </div>
 </div>

data/app/views/doorkeeper/authorizations/error.html.erb

@@ -1,6 +1,7 @@
-<div class="span16">
-  <h2>An error has occurred</h2>
-  <p>
-    <pre><%= @pre_auth.error_response.body[:error_description] %></pre>
-  </p>
+<div class="page-header">
+  <h1>An error has occurred</h1>
 </div>
+
+<main role="main">
+  <pre><%= @pre_auth.error_response.body[:error_description] %></pre>
+</main>

data/app/views/doorkeeper/authorizations/new.html.erb

@@ -1,37 +1,40 @@
-<div class="span16">
-  <h2>Authorize <%= @pre_auth.client.name %> to use your account?</h2>
-</div>
+<header class="page-header" role="banner">
+  <h1>Authorize required</h1>
+</header>
 
-<div class="span16">
-  <% if @pre_auth.scopes %>
-  <p>
-    This application will be able to:
+<main role="main">
+  <p class="h4">
+    Authorize <strong class="text-info"><%= @pre_auth.client.name %></strong> to use your account?
   </p>
-  <ul>
-    <% @pre_auth.scopes.each do |scope| %>
-      <li><%= t scope, :scope => [:doorkeeper, :scopes]  %></li>
-    <% end %>
-  </ul>
+
+  <% if @pre_auth.scopes %>
+    <div id="oauth-permissions">
+      <p>This application will be able to:</p>
+
+      <ul class="text-info">
+        <% @pre_auth.scopes.each do |scope| %>
+          <li><%= t scope, :scope => [:doorkeeper, :scopes] %></li>
+        <% end %>
+      </ul>
+    </div>
   <% end %>
 
-  <div class="inline_block">
+  <div class="actions">
     <%= form_tag oauth_authorization_path, :method => :post do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
       <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag "Authorize", :class => "btn success" %> or
+      <%= submit_tag "Authorize", :class => "btn btn-success btn-lg btn-block" %>
     <% end %>
-  </div>
-  <div class="inline_block">
     <%= form_tag oauth_authorization_path, :method => :delete do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
       <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag "Deny", :class => "btn" %>
+      <%= submit_tag "Deny", :class => "btn btn-danger btn-lg btn-block" %>
     <% end %>
   </div>
-</div>
+</main>

data/app/views/doorkeeper/authorizations/show.html.erb

@@ -1,4 +1,7 @@
-<div class="span16">
-  <h3>Authorization code:</h3>
+<header class="page-header">
+  <h1>Authorization code:</h1>
+</header>
+
+<main role="main">
   <code id="authorization_code"><%= params[:code] %></code>
-</div>
+</main>

data/app/views/doorkeeper/authorized_applications/_delete_form.html.erb

@@ -0,0 +1,5 @@
+<%- submit_btn_css ||= 'btn btn-link' %>
+<%= form_tag oauth_authorized_application_path(application) do %>
+  <input type="hidden" name="_method" value="delete">
+  <%= submit_tag 'Revoke', onclick: "return confirm('Are you sure?')", class: submit_btn_css %>
+<% end %>

data/app/views/doorkeeper/authorized_applications/index.html.erb

@@ -1,25 +1,25 @@
-<div class="span16">
-  <header class="page-header">
-    <h2>Your authorized applications</h2>
-  </header>
+<header class="page-header">
+  <h1>Your authorized applications</h1>
+</header>
 
-  <table class="zebra-striped">
+<main role="main">
+  <table class="table table-striped">
     <thead>
-      <tr>
-        <th>Application</th>
-        <th>Created At</th>
-        <th></th>
-        <th></th>
-      </tr>
+    <tr>
+      <th>Application</th>
+      <th>Created At</th>
+      <th></th>
+      <th></th>
+    </tr>
     </thead>
     <tbody>
-      <% @applications.each do |application| %>
-        <tr>
-          <td><%= application.name %></td>
-          <td><%= application.created_at %></td>
-          <td><%= link_to 'Revoke', oauth_authorized_application_path(application), :data => { :confirm => 'Are you sure?' }, :method => :delete, :class => 'btn danger' %></td>
-        </tr>
-      <% end %>
+    <% @applications.each do |application| %>
+      <tr>
+        <td><%= application.name %></td>
+        <td><%= application.created_at.strftime('%Y-%m-%d %H:%M:%S') %></td>
+        <td><%= render 'delete_form', application: application %></td>
+      </tr>
+    <% end %>
     </tbody>
   </table>
-</div>
+</main>

data/app/views/layouts/doorkeeper/admin.html.erb

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Doorkeeper</title>
+  <%= stylesheet_link_tag "doorkeeper/admin/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+  <div class="container">
+    <div class="navbar-header">
+      <%= link_to 'OAuth2 Provider', oauth_applications_path, class: 'navbar-brand' %>
+    </div>
+    <ul class="nav navbar-nav">
+      <%= content_tag :li, class: "#{'active' if request.path == oauth_applications_path}" do %>
+        <%= link_to 'Applications', oauth_applications_path %>
+      <% end %>
+    </ul>
+  </div>
+</div>
+<div class="container">
+  <%- if flash[:notice].present? %>
+    <div class="alert alert-info">
+      <%= flash[:notice] %>
+    </div>
+  <% end -%>
+
+  <%= yield %>
+</div>
+</body>
+</html>

data/app/views/layouts/doorkeeper/application.html.erb

@@ -1,32 +1,23 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Doorkeeper</title>
-  <%= stylesheet_link_tag    "doorkeeper/application" %>
+  <title>OAuth authorize required</title>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <%= stylesheet_link_tag "doorkeeper/application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-  <section id="main" class="container">
-    <div class="topbar">
-      <div class="fill">
-        <div class="container">
-          <span class="brand">
-            OAuth2 Provider
-          </span>
-        </div>
-      </div>
+<div id="container">
+  <%- if flash[:notice].present? %>
+    <div class="alert alert-info">
+      <%= flash[:notice] %>
     </div>
-    <div class="content">
-      <div class="row">
-        <% flash.each do |key, message| %>
-          <div class="span16">
-            <div class="alert-message <%= key %>" data-alert><a class="close" href="#">×</a><p><%= message %></p></div>
-          </div>
-        <% end %>
+  <% end -%>
 
-        <%= yield %>
-      </div>
-    </div>
-  </section>
+  <%= yield %>
+</div>
 </body>
 </html>

data/lib/doorkeeper/config.rb

@@ -15,10 +15,20 @@ module Doorkeeper
     @config || (raise MissingConfiguration.new)
   end
 
+  def self.orm_model_dir
+    case configuration.orm
+    when :mongoid3, :mongoid4
+      "mongoid3_4"
+    else
+      configuration.orm
+    end
+
+  end
+
   def self.enable_orm
-    require "doorkeeper/models/#{@config.orm}/access_grant"
-    require "doorkeeper/models/#{@config.orm}/access_token"
-    require "doorkeeper/models/#{@config.orm}/application"
+    require "doorkeeper/models/#{orm_model_dir}/access_grant"
+    require "doorkeeper/models/#{orm_model_dir}/access_token"
+    require "doorkeeper/models/#{orm_model_dir}/application"
     require 'doorkeeper/models/access_grant'
     require 'doorkeeper/models/access_token'
     require 'doorkeeper/models/application'
@@ -159,6 +169,7 @@ module Doorkeeper
     option :test_redirect_uri, :default => 'urn:ietf:wg:oauth:2.0:oob'
     option :active_record_options, :default => {}
     option :realm, :default => "Doorkeeper"
+    option :wildcard_redirect_uri, :default => false
 
     def refresh_token_enabled?
       !!@refresh_token_enabled
@@ -185,7 +196,7 @@ module Doorkeeper
     end
 
     def orm_name
-      [:mongoid2, :mongoid3].include?(orm) ? :mongoid : orm
+      [:mongoid2, :mongoid3, :mongoid4].include?(orm) ? :mongoid : orm
     end
 
     def client_credentials_methods

data/lib/doorkeeper/helpers/filter.rb

@@ -7,9 +7,9 @@ module Doorkeeper
 
           before_filter doorkeeper_for.filter_options do
             unless doorkeeper_for.validate_token(doorkeeper_token)
-              render_options = doorkeeper_unauthorized_render_options
               @error = OAuth::InvalidTokenResponse.from_access_token(doorkeeper_token)
               headers.merge!(@error.headers.reject {|k, v| ['Content-Type'].include? k })
+              render_options = doorkeeper_unauthorized_render_options
 
               if render_options.nil? || render_options.empty?
                 head :unauthorized

data/lib/doorkeeper/models/active_record/access_grant.rb

@@ -4,6 +4,6 @@ module Doorkeeper
       establish_connection Doorkeeper.configuration.active_record_options[:establish_connection]
     end
 
-    self.table_name = :oauth_access_grants
+    self.table_name = "#{self.table_name_prefix}oauth_access_grants#{self.table_name_suffix}".to_sym
   end
 end

data/lib/doorkeeper/models/active_record/access_token.rb

@@ -4,7 +4,7 @@ module Doorkeeper
       establish_connection Doorkeeper.configuration.active_record_options[:establish_connection]
     end
 
-    self.table_name = :oauth_access_tokens
+    self.table_name = "#{self.table_name_prefix}oauth_access_tokens#{self.table_name_suffix}".to_sym
 
     def self.delete_all_for(application_id, resource_owner)
       where(:application_id => application_id,

data/lib/doorkeeper/models/active_record/application.rb

@@ -4,7 +4,7 @@ module Doorkeeper
       establish_connection Doorkeeper.configuration.active_record_options[:establish_connection]
     end
 
-    self.table_name = :oauth_applications
+    self.table_name = "#{self.table_name_prefix}oauth_applications#{self.table_name_suffix}".to_sym
 
     if ActiveRecord::VERSION::MAJOR >= 4
       has_many :authorized_tokens, -> { where(revoked_at: nil) }, class_name: "AccessToken"
@@ -19,7 +19,7 @@ module Doorkeeper
 
     def self.authorized_for(resource_owner)
       joins(:authorized_applications)
-        .where(oauth_access_tokens: { resource_owner_id: resource_owner.id, revoked_at: nil })
+        .where(Doorkeeper::AccessToken.table_name => { resource_owner_id: resource_owner.id, revoked_at: nil })
         .group(column_names_with_table.join(','))
     end
   end

data/lib/doorkeeper/models/application.rb

@@ -5,10 +5,11 @@ module Doorkeeper
     has_many :access_grants, :dependent => :destroy, :class_name => "Doorkeeper::AccessGrant"
     has_many :access_tokens, :dependent => :destroy, :class_name => "Doorkeeper::AccessToken"
 
-    validates :name, :secret, :uid, :redirect_uri, :presence => true
+    validates :name, :secret, :uid, :presence => true
     validates :uid, :uniqueness => true
     validates :redirect_uri, :redirect_uri => true
 
+
     before_validation :generate_uid, :generate_secret, :on => :create
 
     if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)

data/lib/doorkeeper/models/mongoid/version.rb

@@ -0,0 +1,15 @@
+module Doorkeeper
+  module Models
+    module Mongoid
+      module Version
+        def mongoid3?
+          ::Mongoid::VERSION.starts_with?("3")
+        end
+
+        def mongoid4?
+          ::Mongoid::VERSION.starts_with?("4")
+        end
+      end
+    end
+  end
+end

data/lib/doorkeeper/models/{mongoid3 → mongoid3_4}/access_grant.rb

@@ -1,5 +1,6 @@
 require 'doorkeeper/models/mongoid/revocable'
 require 'doorkeeper/models/mongoid/scopes'
+require 'doorkeeper/models/mongoid/version'
 
 module Doorkeeper
   class AccessGrant
@@ -7,10 +8,16 @@ module Doorkeeper
     include Mongoid::Timestamps
     include Doorkeeper::Models::Mongoid::Revocable
     include Doorkeeper::Models::Mongoid::Scopes
+    extend Doorkeeper::Models::Mongoid::Version
 
     self.store_in collection: :oauth_access_grants
 
-    field :resource_owner_id, :type => Moped::BSON::ObjectId
+    if defined?(Moped::BSON)
+      field :resource_owner_id, :type => Moped::BSON::ObjectId
+    else
+      field :resource_owner_id, :type => BSON::ObjectId
+    end
+
     field :application_id, :type => Hash
     field :token, :type => String
     field :expires_in, :type => Integer

data/lib/doorkeeper/models/{mongoid3 → mongoid3_4}/access_token.rb

@@ -1,5 +1,6 @@
 require 'doorkeeper/models/mongoid/revocable'
 require 'doorkeeper/models/mongoid/scopes'
+require 'doorkeeper/models/mongoid/version'
 
 module Doorkeeper
   class AccessToken
@@ -7,10 +8,16 @@ module Doorkeeper
     include Mongoid::Timestamps
     include Doorkeeper::Models::Mongoid::Revocable
     include Doorkeeper::Models::Mongoid::Scopes
+    extend Doorkeeper::Models::Mongoid::Version
 
     self.store_in collection: :oauth_access_tokens
 
-    field :resource_owner_id, :type => Moped::BSON::ObjectId
+    if defined?(Moped::BSON)
+      field :resource_owner_id, :type => Moped::BSON::ObjectId
+    else
+      field :resource_owner_id, :type => BSON::ObjectId
+    end
+
     field :token, :type => String
     field :expires_in, :type => Integer
     field :revoked_at, :type => DateTime