social_stream-oauth2_server 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865501e44185f2dc43005b204a8fe933e9023c71
-  data.tar.gz: e99b0ed5463fa634f9913fd4e6d688639a50026e
+  metadata.gz: e5874569601b0facde73388ee10a32044bc0bc6e
+  data.tar.gz: 96810fac87271a300f61ea2aa58fc68ef6577286
 SHA512:
-  metadata.gz: 3d2bdaf781dfdaa2398fab06047951aa097e8b8598fec1fb8ce873e1e2b8ece122f191795f67a9b343900ef526663763c202047acd73a5634442225352444cb8
-  data.tar.gz: cdde205d4c00a4451bc265d8c017c3f67289f4981ccc1a3a90fe6742daa5b97b6b49ac9dcf91248034b444163fc807f1a056cff751ac71c205502cd0f8993f09
+  metadata.gz: 9e81ba78877af6bb87b7a09ae819ad3788898e5aac3431a3ccf05938384cc0614d458e1e97c5369d6d07ac4358e4a320eac0439fc4caf7c4f8383c06de1632e5
+  data.tar.gz: 1219933a3ca94f0de905540b9b075cf2c009491250bd04875dd8fc89848b499055dd40ce54e67736fbb9099cb0a7f2675c797e2603bd2e2b8a8f2912498708b3

data/app/assets/stylesheets/social_stream-oauth2_server.css.sass

@@ -1,3 +1,5 @@
+@import "social_stream/oauth2_server/mixins/mixins/"
+
 @import "social_stream/oauth2_server/applications/applications-oauth2server"
 @import "social_stream/oauth2_server/applications/layout/applications-oauth2server"
 

data/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass

@@ -1,40 +1,39 @@
-#site_clients
-  .site_clients
-    header
-      h1
-        @include colorfont-big-size
-        float: left
-      a
-        @include btn-primary
-        @include border-radius(5px)
-        margin: 12px 0
-      .soften
-        @include opacity (100)
-
-    .name,
-    .url,
-    .users
-      color: $gray
+.site_clients
+  header
+    h1
+      @include colorfont-big-size
+      float: left
+    a
+      @include btn-primary
+      @include border-radius(5px)
+      margin: 12px 0
+    .soften
+      @include opacity (100)
 
-    .name
-      font-size: 16px
+  .name,
+  .url,
+  .users
+    color: $gray
 
-    .url
-      a
-        color: $gray
-        &:hover
-          color: $blue
+  .name
+    font-size: 16px
 
-    .users
-      font-size: 16px
-      span
+  .url
+    a
+      color: $gray
+      &:hover
         color: $blue
 
-  #new_site_client-modal
-    .modal-body
-      input
-        &[type="file"]
-          line-height: 0px
+  .users
+    font-size: 16px
+    span
+      color: $blue
+
+#new_site_client-modal
+  .modal-body
+    input
+      &[type="file"]
+        line-height: 0px
 
 .field_with_errors
   input
@@ -44,3 +43,19 @@
 #new_application
   .btn
     @include btn-primary
+
+
+#site_client
+  margin-top: 48px
+  header
+    z-index: 100
+    margin-bottom: 0
+    h1
+      z-index: 50
+      position: absolute
+      margin-top: -47px
+    img
+      z-index: 100
+      margin: -47px 4px 0px 0px
+
+    

data/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass

@@ -2,6 +2,8 @@
   @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
   float: left
   margin-left: 2.5%
+  img
+    width: 70%
 #content
   .box
     padding: 14px 20px 74px 20px
@@ -18,6 +20,18 @@
       height: 135px
       margin-top: -131px
 
-
+#site_client_form
+  .description,
+  .url,
+  .callback_url
+    textarea
+      height: 20px
+  .description
+    textarea
+      height: 60px
+  input
+    &[type="submit"]
+      @include btn-primary
+      @include border-radius (5px)
 
 

data/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixins.css.sass

@@ -0,0 +1,5 @@
+@mixin principal-box
+  @include border-radius(5px)
+  @include box-shadow (1px 1px 15px 0px rgba(50, 50, 50, 0.1))
+  border: 1px solid 
+  border-color: rgba(0,0,0, 0.1)

data/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass

@@ -7,16 +7,16 @@
       color: #ccc
 
 
-#oauth2_server 
+#site_client
   h1
     text-align: left
-  .content
-    @include gradient-vertical($startColor: #ccc, $endColor: #f9f9f9)
-    a
-      img
-        background-color: #f9f9f9
-    .media
-    .media-body
+  .site_client
+    @include principal-box   
+    .content
+      a
+        img
+          background-color: #f9f9f9
+      
       .name,
       .url,
       .users
@@ -28,10 +28,7 @@
           color: $gray
           &:hover
             color: $blue
-      .result,
-      .client_secret
-        background-color: #f9f9f9
-        @include border-radius(5px)
+      .result
         font-size: 15px
 
       .client_secret
@@ -39,7 +36,7 @@
         overflow-y: hidden
         overflow-x: scroll
 
-    .users
-      font-size: 16px
-      span
-        color: $blue
+      .users
+        font-size: 16px
+        span
+          color: $blue

data/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass

@@ -29,43 +29,64 @@
       margin-right: 1px
 
 
-#oauth2_server 
-  width: 80%
+#site_client 
+  width: 75%
   margin-left: 2.85%
-  display: inline-block
-  h1
-    @include clearfix
-    margin-bottom: 4px
-  .soften
-    margin-bottom: 0px
-  .content
-    padding: 14px
-    .media
-      margin-top: 0
-    .media-body
-      margin-left: 2.85%
+  .site_client
+    width: 95% 
+    padding-left: 2.5%
+    padding-right: 2.5%
+    display: inline-block
+    h1
+      @include clearfix
+      margin-bottom: 4px
+      margin-left: -2.5%
+      a
+        font-size: 13px
+    .soften
+      margin-bottom: 0px
+    .content
+      padding: 14px
       img
         display: inline
         @include size (40px, 40px)
-      h4
-        margin-bottom: 0px
-      .name,
-      .url,
-      .users
-        display: inline-block
-      .name,
-      .url
-        margin-left: 20px
+      .gereral-info
+        @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        float: left
+        margin-top: -50px
+        h4
+          margin-bottom: 0px
+        .name,
+        .url,
+        .users
+          display: inline-block
+        .name,
+        .url
+          margin-left: 20px
 
-      .result,
-      .client_secret
-        padding: 7px
-        margin-bottom: 20px
+        .result
+          margin-bottom: 18px
+          margin-left: 20px
+          padding-top: 5px
+          border-top: 1px solid #C1C1C1
+      .btn-group
+        @include btn-primary
+        @include border-radius(5px)
+        @include btn-add
+        .dropdown-menu
+          width: 300px
+          margin-left: -196px
+          li
+            word-break: break-all
+            overflow-y: hidden
+            overflow-x: scroll
+            h6
+              border-bottom: 1px solid #CCC
+              a
+                color: principalColor
 
-      .client_secret
-        height: 23px
-        p
-          width: 250%
-    .users
-      float: right
-      margin-top: 7px
+
+     
+  .users
+    float: right
+    margin-top: 7px

data/app/controllers/site/clients_controller.rb

@@ -29,6 +29,24 @@ class Site::ClientsController < ApplicationController
     end
   end
 
+  def edit
+    @client = Site::Client.find params[:id]
+  end
+
+  def update
+    @client = Site::Client.find params[:id]
+
+    if @client.update_attributes params[:client]
+      respond_to do |format|
+        format.html { redirect_to @client }
+      end
+    else
+      respond_to do |format|
+        format.html { render :edit }
+      end
+    end
+  end
+
   private
 
   def set_author_ids

data/app/decorators/social_stream/base/user_decorator.rb

@@ -1,3 +1,20 @@
 User.class_eval do
   include SocialStream::Oauth2Server::Models::User
+
+  def as_json_with_client options = {}
+    hash = as_json_without_client options
+
+    if options[:client] && !options[:client].is_a?(User)
+      hash['roles'] = options[:client].contact_to!(self).relations.map{ |r|
+        { 
+          id: r.id,
+          name: r.name
+        }
+      }
+    end
+
+    hash
+  end
+
+  alias_method_chain :as_json, :client
 end

data/app/decorators/social_stream/base/users_controller_decorator.rb

@@ -0,0 +1,8 @@
+UsersController.class_eval do
+  def current
+    binding.pry
+    respond_to do |format|
+      format.json { render json: current_user.to_json(client: oauth2_token.try(:client)) }
+    end
+  end
+end

data/app/models/oauth2_token.rb

@@ -27,7 +27,7 @@ class Oauth2Token < ActiveRecord::Base
   protected
 
   def setup
-    self.token = SecureRandom.base64(64)
+    self.token = SecureRandom.urlsafe_base64(64)
     self.expires_at ||= default_lifetime.from_now
   end
 end

data/app/overrides/layouts/_header_dropdown_menu/applications_entry.html.erb.deface

@@ -1,4 +1,4 @@
 <!-- insert_after "code[erb-loud]:contains('header_dropdown_menu_sessions')" -->
-<li>
+<li class="applications-menu">
   <%= link_to t('account.applications'), site_clients_path %>
 </li>

data/app/views/site/clients/_form.html.erb

@@ -1,39 +1,39 @@
-<article class="new_app">
-  <%= form_for(@client || Site::Client.new) do |f| %>
-
-    <% if f.object.errors.any? %>
-      <div id="error_explanation" class="alert alert-error">
-        <h2><%= pluralize(f.object.errors.count, "error") %> prohibited this client site from being saved:</h2>
-
-        <ul>
-          <% f.object.errors.full_messages.each do |msg| %>
-            <li><%= msg %></li>
-          <% end %>
-        </ul>
-
-      </div>
-    <% end %>
-    <article id="new_application">
-      <section class="name">
-        <%= f.label :name %>
-        <%= f.text_field :name %>
-      </section>
-
-      <section class="description">
-        <%= f.label :description %>
-        <%= f.text_area :description %>
-      </section>
-
-      <section class="url">
-        <%= f.label :url %>
-        <%= f.text_area :url %>
-      </section>
-
-      <section class="callback_url">
-        <%= f.label :callback_url %>
-        <%= f.text_area :callback_url %>
-      </section>
-      <%= f.submit :class => "btn pull-right" %>
-    </article>  
+<%= form_for(@client || Site::Client.new) do |f| %>
+
+  <% if f.object.errors.any? %>
+    <div id="error_explanation" class="alert alert-error">
+      <h2><%= pluralize(f.object.errors.count, "error") %> prohibited this client site from being saved:</h2>
+
+      <ul>
+        <% f.object.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+
+    </div>
   <% end %>
-</article>
+
+  <section id="site_client_form">
+    <section class="name">
+      <%= f.label :name %>
+      <%= f.text_field :name %>
+    </section>
+
+    <section class="description">
+      <%= f.label :description %>
+      <%= f.text_area :description %>
+    </section>
+
+    <section class="url">
+      <%= f.label :url %>
+      <%= f.text_area :url %>
+    </section>
+
+    <section class="callback_url">
+      <%= f.label :callback_url %>
+      <%= f.text_area :callback_url %>
+    </section>
+
+    <%= f.submit %>
+  </section>
+<% end %>

data/app/views/site/clients/_form_step1.html.erb

@@ -0,0 +1,7 @@
+<%= image_tag 'step_1.png' %>
+
+<article class="new_app">
+  <%= render partial: 'form' %>
+</article>
+
+

data/app/views/site/clients/_form_step2.html.erb

@@ -0,0 +1,20 @@
+<img src="/assets/step_2.png">
+<article class="permissions">
+  <h4>
+    <%= raw t('permission.of_relation.choose', :name => h(@relation.name)) %>
+  </h4>
+
+  <%= form_for @relation, url: polymorphic_path(@relation, section: 'permissions'), remote: true do |f| %>
+    <%= hidden_field_tag 'relation_custom[permission_ids][]', "" %>
+
+    <ul>
+      <% default_permissions.each do |p| %>
+        <li>
+        <%= check_box_tag 'relation_custom[permission_ids][]', p.id, @relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ @relation.id }_permission_#{ p.id }" %>
+        <%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject), title: p.description(:detailed, subject: current_subject, state: (@relation.permission_ids.include?(p.id) ? 'positive' : 'negative'), relation: @relation.name) %>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+  <%= f.submit :next %>
+</article>

data/app/views/site/clients/_list.html.erb

@@ -0,0 +1,24 @@
+<section class="site_clients_list">
+  <% list.each do |client| %>
+
+    <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
+
+    <div class="name">
+      <%= link_to client.name, client %>
+    </div>
+    <div class="url">
+      <%= link_to client.url, client.url, target: '_blank' %>
+    </div>
+    <div class="users">
+      <span>
+        5
+      </span>
+      users
+    </div>
+  <hr class="soften">
+  <% end %>
+
+  <%= javascript_tag do %>
+    SocialStream.SiteClient.index();
+  <% end %>
+</section>

data/app/views/site/clients/edit.html.erb

@@ -0,0 +1,14 @@
+<section id="edit_site_client"> 
+
+  <%= render partial: 'toolbar/home' %>
+
+  <section class="edit_site_client" id="edit_<%= dom_id @client %>">
+    <%= render partial: 'form' %>
+    
+    <section class="site_client_roles">
+      <%= render partial: 'relation/customs/index',
+                 locals: { list: @client.relations } %>
+    </section>
+  </section>
+</section>
+

data/app/views/site/clients/index.html.erb

@@ -1,42 +1,59 @@
 <section id="site_clients" class="first-img">
 
-  <%= render partial: 'toolbar/home' %>
+    <%= render partial: 'toolbar/home' %>
 
   <section class="site_clients">
     <header>
-      <h1 class="colorfont">
+      <h3>
+        <%= link_to t('site.client.new.link'), new_site_client_path, class: "new_site_client-modal-link", 'data-toggle' => 'modal'  %>
+        
         <%= t 'site.client.added' %>
-      </h1>
-
-      <%= link_to t('site.client.new.link'), new_site_client_path, class: "new_site_client-modal-link", 'data-toggle' => 'modal'  %>
-
-      <%= render partial: 'new.modal' %>
-
-      <hr class="soften">
+      </h3>
     </header>
+    <div class="tabbable"> <!-- Only required for left/right tabs -->
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#tab1" data-toggle="tab">Mine</a></li>
+        <li><a href="#tab2" data-toggle="tab">Others</a></li>
+      </ul>
+      <div class="search-nav hidden-phone">
+        <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
+          <%= text_field_tag :q, nil, autocomplete: :off, class: 'search-query input-small', placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
+        <% end %>
+        <%= javascript_tag do %>
+          $(function() {
+            SocialStream.SearchHeader.show();
+          });
+        <% end %>
+        <div class="mat">
+          <%= render partial: 'layouts/loading' %>
+
+          <div class="query_too_short">
+            <%= t 'search.at_least', count: SocialStream::Search::MIN_QUERY %>
+          </div>
+
+          <div class="no_results">
+            <%= t 'search.nothing' %>
+          </div>
+
+          <div class="results">
+          </div>
+        </div>
+      </div>
 
-    <% @developer_clients.each do |client| %>
 
-      <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
+      <div class="tab-content">
+        <div class="tab-pane active" id="tab1">
+          <%= render partial: 'list',
+               object: @developer_clients %>
+        </div>
 
-      <div class="name">
-        <%= link_to client.name, client %>
+        <div class="tab-pane" id="tab2">
+        </div>
       </div>
-      <div class="url">
-        <%= link_to client.url, client.url, target: '_blank' %>
-      </div>
-      <div class="users">
-        <span>
-          5
-        </span>
-        users
-      </div>
-    <hr class="soften">
-    <% end %>
+    </div>
 
-    <%= javascript_tag do %>
-      SocialStream.SiteClient.index();
-    <% end %>
+    <%= render partial: 'new.modal' %>
 
+    <hr class="soften">
   </section>
 </section>

data/app/views/site/clients/new.html.erb

@@ -2,9 +2,9 @@
   <%= render partial: 'toolbar/home' %>
 
   <section class="new_site_client">
-    <h1><%= t 'site.client.new.title' %></h1>
 
-    <%= render partial: 'form' %>
+
+    <%= render partial: 'form_step1' %>
   </section>
 </section>
 

data/app/views/site/clients/show.html.erb

@@ -1,52 +1,114 @@
-<div class="oauth2_server"> 
+<section id="site_client">
   <%= render partial: 'toolbar/home' %>
 
-  <section id="oauth2_server">  
-    <h1>
-      <%= @client.name %>
-    </h1>
-    <a class="pull-right" href="#">
-      ir a tus demás aplicaciones
-      </a>
-    <hr class="soften">
-    <div class="content">
-      <a class="pull-left" href="#">
+  <section class="site_client" id="<%= dom_id @client %>">
+    <header>  
+      <h1>
+        <%= @client.name %>
+        <a class="go-more" href="#">
+          ir a tus demás aplicaciones
+        </a>
+      </h1>
+
+      <%= image_tag('logos/app-default.png', class: "logo-app pull-right") %>
+
+    </header>
 
-        <%= image_tag('logos/app-default.png', class: "media-object") %>
+    <div class="content">
+      <div class="gereral-info">      
+        <h4>
+          <%= Site::Client.human_attribute_name :description %>
+        </h4>
+        <div class="result">
+          <%= link_to @client.description, @client.description%>
+        </div>
 
+        <h4>
+          <%= Site::Client.human_attribute_name :url %>
+        </h4>
+        <div class="result">
+          <%= link_to @client.url, @client.url%>
+        </div>
 
+        <h4>
+          <%= Site::Client.human_attribute_name :callback_url %>
+        </h4>
+        <div class="result">
+          <%= @client.callback_url %>
+        </div>
+      </div>
         
-      </a>
-      <article  class="media box">
-        <div class="media-body">
-          <h4>
-            <%= Site::Client.human_attribute_name :url %>
-          </h4>
-          <div class="result">
-            <%= link_to @client.url, @client.url%>
-          </div>
-          <h4>
-            <%= Site::Client.human_attribute_name :callback_url %>
-          </h4>
-          <div class="result">
-            <%= @client.callback_url %>
-          </div>
-          <h4>
+      <div class="btn-group">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+          Credentials
+          <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu">
+          <li>
+            <h6>
             <%= Site::Client.human_attribute_name :id %>
-          </h4>
-          <div class="result">
+            <a href="#" class="pull-right">refresh</a>
+            </h6>
             <%= @client.id %>
-          </div>
-          <h4>
-            <%= Site::Client.human_attribute_name :secret %>
-          </h4>
-          <div class="result client_secret">
-            <p>
-              <%= @client.secret %>
-            </p>
-          </div>
-        </div>
-      </article>
+          </li>
+
+          <li>
+            <h6>
+              <%= Site::Client.human_attribute_name :secret %>
+              <a href="#" class="pull-right">refresh</a>
+            </h6>
+            <%= @client.secret %>
+          </li>
+        </ul>  
+      </div>   
     </div>
   </section>
-</div>
+
+  <div class="tabbable"> <!-- Only required for left/right tabs -->
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="#tab1" data-toggle="tab">Users</a></li>
+      <li><a href="#tab2" data-toggle="tab">Organizations</a></li>
+      <li><a href="#tab3" data-toggle="tab">Stats</a></li>
+    </ul>
+    <div class="search-nav hidden-phone">
+      <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
+        <%= text_field_tag :q, nil, autocomplete: :off, class: 'search-query input-small', placeholder: t('search.name'), "data-min_query" => SocialStream::Search::MIN_QUERY %>
+      <% end %>
+      <%= javascript_tag do %>
+        $(function() {
+          SocialStream.SearchHeader.show();
+        });
+      <% end %>
+      <div class="mat">
+        <%= render partial: 'layouts/loading' %>
+
+        <div class="query_too_short">
+          <%= t 'search.at_least', count: SocialStream::Search::MIN_QUERY %>
+        </div>
+
+        <div class="no_results">
+          <%= t 'search.nothing' %>
+        </div>
+
+        <div class="results">
+        </div>
+      </div>
+    </div>
+
+
+    <div class="tab-content">
+      <div class="tab-pane active" id="tab1">
+        <ul class="nav nav-pills">
+          <li class="active">
+            <a href="#">added</a>
+          </li>
+          <li><a href="#">registered</a></li>
+        </ul>
+      </div>
+
+      <div class="tab-pane" id="tab2">
+      </div>
+    </div>
+  </div>
+
+</section>

data/config/locales/en.yml

@@ -18,8 +18,15 @@ en:
       title: Authorize %{client}?
       permission:
         title: 'The site %{client} will be able to:'
+  helpers:
+    submit:
+      site_client:
+        create: "Next"
+        update: "Save"
   permission:
     public_info: Read your public information
+  relation_admin:
+    name: "Site Client Admin"
   site:
     client:
       added: Added sites

data/config/locales/es.yml

@@ -10,8 +10,15 @@ es:
         name: Nombre
         secret: Client Secret
         url: URL
+  helpers:
+    submit:
+      site_client:
+        create: "Siguiente"
+        update: "Guardar"
   permission:
     public_info: Acceder a tu información pública
+  relation_admin:
+    name: "Administrador de Sitio"
   site:
     client:
       added: Sitios añadidos

data/lib/social_stream/oauth2_server/token_endpoint.rb

@@ -9,30 +9,31 @@ module SocialStream
 
       def authenticator
         Rack::OAuth2::Server::Token.new do |req, res|
-        client = Site::Client.find(req.client_id) || req.invalid_client!
-        client.secret == req.client_secret || req.invalid_client!
+          client = Site::Client.find(req.client_id) || req.invalid_client!
+          client.secret == req.client_secret || req.invalid_client!
 
-        case req.grant_type
-        when :authorization_code
-          code = Oauth2Token::AuthorizationCode.valid.find_by_token(req.code)
-          req.invalid_grant! if code.blank? || code.redirect_uri != req.redirect_uri
+          case req.grant_type
+          when :authorization_code
+            code = Oauth2Token::AuthorizationCode.valid.find_by_token(req.code)
+            req.invalid_grant! if code.blank? || code.redirect_uri != req.redirect_uri
 
-          res.access_token = code.access_token.to_bearer_token(:with_refresh_token)
-        when :password
-          # TODO
-          account = Account.find_by_username_and_password(req.username, req.password) || req.invalid_grant!
-          res.access_token = account.access_tokens.create(:client => client).to_bearer_token(:with_refresh_token)
-        when :client_credentials
-          # NOTE: client is already authenticated here.
-          res.access_token = client.access_tokens.create!.to_bearer_token
-        when :refresh_token
-          refresh_token = client.refresh_tokens.valid.find_by_token(req.refresh_token)
-          req.invalid_grant! unless refresh_token
-          res.access_token = refresh_token.access_tokens.create!.to_bearer_token
-        else
-          # NOTE: extended assertion grant_types are not supported yet.
-          req.unsupported_grant_type!
-        end
+            res.access_token = code.access_token.to_bearer_token(:with_refresh_token)
+          when :password
+            user = User.find_for_authentication(email: req.username) || req.invalid_grant!
+            user.valid_password?(req.password) || req.invalid_grant!
+
+            res.access_token = user.access_tokens.create(:client => client).to_bearer_token(:with_refresh_token)
+          when :client_credentials
+            # NOTE: client is already authenticated here.
+            res.access_token = client.access_tokens.create!.to_bearer_token
+          when :refresh_token
+            refresh_token = client.refresh_tokens.valid.find_by_token(req.refresh_token)
+            req.invalid_grant! unless refresh_token
+            res.access_token = refresh_token.access_tokens.create!.to_bearer_token
+          else
+            # NOTE: extended assertion grant_types are not supported yet.
+            req.unsupported_grant_type!
+          end
         end
       end
     end

data/lib/social_stream/oauth2_server/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/social_stream-oauth2_server.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.3')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.4')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-oauth2_server
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,8 @@ files:
 - Rakefile
 - app/assets/images/logos/app-default.png
 - app/assets/images/logos/small/site.png
+- app/assets/images/step_1.png
+- app/assets/images/step_2.png
 - app/assets/javascripts/social_stream-oauth2_server.js
 - app/assets/javascripts/social_stream/site_client.js
 - app/assets/stylesheets/social_stream-oauth2_server.css.sass
@@ -82,6 +84,7 @@ files:
 - app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-1200px-min.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-767px-max.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/create/responsive/_responsive-768px-979px.css.sass
+- app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixins.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass
 - app/assets/stylesheets/social_stream/oauth2_server/show/responsive/_responsive-1200px-min.css.sass
@@ -91,6 +94,7 @@ files:
 - app/controllers/site/clients_controller.rb
 - app/decorators/social_stream/base/actor_decorator.rb
 - app/decorators/social_stream/base/user_decorator.rb
+- app/decorators/social_stream/base/users_controller_decorator.rb
 - app/helpers/site_client_helper.rb
 - app/models/oauth2_token.rb
 - app/models/oauth2_token/access_token.rb
@@ -104,8 +108,12 @@ files:
 - app/views/authorizations/error.html.erb
 - app/views/authorizations/new.html.erb
 - app/views/site/clients/_form.html.erb
+- app/views/site/clients/_form_step1.html.erb
+- app/views/site/clients/_form_step2.html.erb
+- app/views/site/clients/_list.html.erb
 - app/views/site/clients/_new.modal.html.erb
 - app/views/site/clients/_presentation.html.erb
+- app/views/site/clients/edit.html.erb
 - app/views/site/clients/index.html.erb
 - app/views/site/clients/new.html.erb
 - app/views/site/clients/show.html.erb