social_stream-oauth2_server 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ad473cb098893e70019be985fb955ed25d9be8
-  data.tar.gz: 42c14dc76f1727f9391b7bbe552d20ccc7132275
+  metadata.gz: 0f974cd2ca225c2e81f96ebfe5705847aa8f79db
+  data.tar.gz: 767419bbe1194902609edfdea7d5502968c4882c
 SHA512:
-  metadata.gz: ac541dd775db872b3dae6ae7841ac28310821d6be214062f81070c66a7650c28853ed9d86f60375141bbf12dd1d8eaa19bf9f679edbbbab414e02823641686bd
-  data.tar.gz: bc4534f5b7024c56255601f6bbe37f990f4dc63e19b23d7e9567849565631af6e2082456b83e9a45ed2c0a295a2f2f8b04482607f1cf3c9908f4e395ddf9fac8
+  metadata.gz: 047a94b500d2e5b14fde61acc72d5978babf0d9fa5c67c6c7cb2a856449cb9686dead638ee8a86ec0911bfd14567bc2e790ef7a623ee7c87e3c464c15ed11ec9
+  data.tar.gz: 57c1b9cf96589fcf8fe39790460e8ac712b65e194af414d69a6b0e2ed24455ee48201e12743b8a26a86b6f2da222180b91ee27a2006726431e880cf0e3100b4b

data/Rakefile

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 
 require 'rdoc/task'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/app/assets/javascripts/social_stream/site_client.js

@@ -1,4 +1,5 @@
 //= require social_stream/callback
+//= require social_stream/flash
 
 SocialStream.SiteClient = (function(SS, $, undefined) {
   var callback = new SS.Callback();
@@ -7,8 +8,34 @@ SocialStream.SiteClient = (function(SS, $, undefined) {
     $('.new_site_client-modal-link').attr('href', '#new_site_client-modal');
   };
 
+  var initRefreshButton = function() {
+    $('form.site-client-secret').submit(sendSecretRefresh);
+  };
+
+  var sendSecretRefresh = function(e) {
+    var form = $(e.target);
+
+    e.preventDefault();
+
+    $.ajax({
+      url: form.attr('action'),
+      method: form.attr('method'),
+      dataType: 'json',
+      success: function(data) {
+        SS.Flash.success(I18n.t('site.client.oauth.secret.refreshed'));
+
+        $('span.site-client-secret').html(data.secret).effect('highlight', {}, 3000);
+      },
+      error: function(jqXHR, textStatus) {
+        SS.Flash.error(textStatus);
+      }
+    });
+  };
+
   callback.register('index', initNewModal);
 
+  callback.register('show', initRefreshButton);
+
   return callback.extend({
   });
 

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

@@ -48,8 +48,3 @@
       input
         &[type="file"]
           line-height: 0px
-
-
-.site_clients_list
-  ul 
-    li

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

@@ -29,9 +29,7 @@
   .description
     textarea
       height: 60px
-  input
-    &[type="submit"]
-      @include btn-primary
-      @include border-radius (5px)
-
+.next-step
+  @include btn-secundary
+  float: right
 

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

@@ -37,12 +37,14 @@
     padding: 0 2.5%
     margin-bottom: 30px
     display: inline-block
-    h1
-      @include clearfix
-      margin-bottom: 4px
-      margin-left: -2.5%
-      a
-        font-size: 13px
+    header
+      margin-top: -37px
+      h4
+        @include clearfix
+        margin-bottom: 4px
+        margin-left: -2.5%
+        a
+          font-size: 13px
     .soften
       margin-bottom: 0px
     .content

data/app/controllers/site/clients_controller.rb

@@ -1,60 +1,36 @@
 class Site::ClientsController < ApplicationController
-  before_filter :authenticate_user!
+  include SocialStream::Controllers::Subjects
+  include SocialStream::Controllers::Authorship
 
-  before_filter :set_author_ids, only: [ :new, :create, :update ]
+  before_filter :authenticate_user!
 
   load_and_authorize_resource
 
-  def index
-    @clients = current_subject.managed_site_clients
-  end
-
   def create
-    @client = Site::Client.new params[:site_client]
-
-    if @client.save
-      respond_to do |format|
-        format.html { 
-          redirect_to edit_site_client_path(@client, step: 2)
-        }
-      end
-    else
-      respond_to do |format|
-        format.html { render :new }
-      end
+    create! do |success, error|
+      success.html { 
+        redirect_to polymorphic_path(resource, action: :edit, step: 2)
+      }
+      error.html { render :new }
     end
   end
 
-  def edit
-    @client = Site::Client.find params[:id]
-  end
+  # Refresh the site client token
+  def update_secret
+    resource.refresh_secret!
 
-  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
+    respond_to do |format|
+      format.json { render json: { secret: resource.secret } }
     end
   end
 
   def destroy
-    @client.destroy
-
-    redirect_to home_path
+    destroy! { :home }
   end
 
-  private
+  protected
 
-  def set_author_ids
-    params[:site_client] ||= HashWithIndifferentAccess.new
-    params[:site_client][:author_id]      = current_subject.actor_id
-    params[:site_client][:user_author_id] = current_user.actor_id
-    params[:site_client][:owner_id]       = current_subject.actor_id
+  def collection
+    current_subject.managed_site_clients
   end
 end

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

@@ -0,0 +1,2 @@
+# FIXME: dirty hack ahead!
+Relation::Positive << "manager"

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

@@ -1,20 +1 @@
-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
+User.send :include, SocialStream::Oauth2Server::Models::User

data/app/models/relation/manager.rb

@@ -1,19 +1,10 @@
 # Owner of client sites
 class Relation::Manager < Relation::Single
-  PERMISSIONS =
-    [
-      [ 'manage', nil ],
-      [ 'manage', 'relation/custom' ],
-      [ 'manage', 'contact' ]
-    ]
+  PERMISSIONS = SocialStream.available_permissions['site/client']
 
   class << self
     def create_activity?
       false
     end
   end
-
-  def available_permissions
-    Permission.instances PERMISSIONS
-  end
 end

data/app/models/site/client.rb

@@ -23,8 +23,10 @@ class Site::Client < Site
     end
   end
 
-  def to_param
-    id
+  # Generate a new OAuth secret for this site client
+  def refresh_secret!
+    set_secret
+    save!
   end
 
   private

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

@@ -0,0 +1,11 @@
+<div id="destroy_site_client" class="accordion-group">
+  <header class="accordion-heading">
+    <h5>
+      <%= link_to t("site.client.destroy.title"), "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#site_client-accordion", "data-target" => "#destroy_site_client-content" %>
+    </h5>
+  </header>
+  
+  <div class="content collapse" id="destroy_site_client-content">
+    <%= link_to t("site.client.destroy.link"), resource, confirm: t("site.client.destroy.confirm"), method: :delete %>
+  </div>
+</div>

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

@@ -1,6 +1,13 @@
-<%= render partial: 'form' %>
+<section class="edit_form">
+  <%= render partial: 'form' %>
+</section>
 
 <section class="site_client_roles">
   <%= render partial: 'relation/customs/index',
-             locals: { subject: @client } %>
+             locals: { subject: resource } %>
+</section>
+
+<section class="delete">
+  <%= render partial: 'destroy' %>
 </section>
+

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

@@ -1,11 +1,11 @@
 <%= image_tag 'step_2.png' %>
 
-<section class="new_app">
-<h1>Set the application's logo</h1>
+<section class="create_logo_app">
+  <h4>Set the application's logo</h4>
 
-<%= render partial: 'avatars/form',
-           object: @client,
-           as: :avatarable %>
+  <%= render partial: 'avatars/form',
+             object: resource,
+             as: :avatarable %>
 
-<%= link_to "Next", edit_site_client_path(@client, step: 3) %>
+  <%= link_to "Next", polymorphic_path(resource, action: 'edit', step: 3), class: "next-step" %>
 </section>

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

@@ -1,10 +1,12 @@
 <%= image_tag 'step_3.png' %>
 
-<h1>Manage roles and permissions</h1>
+<section class="new_app">
+  <h4>Manage roles and permissions</h4>
 
-<section class="site_client_roles">
-  <%= render partial: 'relation/customs/index',
-             locals: { subject: @client } %>
-</section>
+  <section class="site_client_roles">
+    <%= render partial: 'relation/customs/index',
+               locals: { subject: resource } %>
+  </section>
 
-<%= link_to 'Finish', @client %>
+  <%= link_to 'Finish', resource, class: "next-step" %>
+</section>

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

@@ -1,4 +1,4 @@
-<%= form_for(@client || Site::Client.new) do |f| %>
+<%= form_for(begin; resource; rescue ActiveRecord::RecordNotFound; end || resource_class.new) do |f| %>
 
   <% if f.object.errors.any? %>
     <div id="error_explanation" class="alert alert-error">
@@ -14,26 +14,26 @@
   <% end %>
 
   <section id="site_client_form">
-    <section class="name">
+    <div class="name">
       <%= f.label :name %>
       <%= f.text_field :name %>
-    </section>
+    </div>
 
-    <section class="description">
+    <div class="description">
       <%= f.label :description %>
       <%= f.text_area :description %>
-    </section>
+    </div>
 
-    <section class="url">
+    <div class="url">
       <%= f.label :url %>
       <%= f.text_area :url %>
-    </section>
+    </div>
 
-    <section class="callback_url">
+    <div class="callback_url">
       <%= f.label :callback_url %>
       <%= f.text_area :callback_url %>
-    </section>
-
-    <%= f.submit %>
+    </div>
   </section>
+  <%= f.submit :class => "next-step" %>
+
 <% end %>

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

@@ -2,19 +2,31 @@
   <ul>
     <% list.each do |client| %>
       <li>
-        <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
+        <%= link_to client do %>
+          <%= image_tag client.logo.url(:small) %>
+        <% end %>
 
-        <div class="name">
-          <%= link_to client.name, client %>
+        <div class="data">
+          <div class="name">
+            <%= link_to client.name, client %>
+          </div>
+          <div class="url">
+            <%= link_to client.url, client.url, target: '_blank' %>
+          </div>
         </div>
-        <div class="url">
-          <%= link_to client.url, client.url, target: '_blank' %>
-        </div>
-        <div class="users">
-          <span>
-            5
-          </span>
-          users
+        <div class="team">
+          <div class="users">
+            <span>
+              5
+            </span>
+            users
+          </div>  
+          <div class="auth">
+            <span>
+              15
+            </span>
+            authorized
+          </div>   
         </div>
         <hr class="soften">
       </li>

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

@@ -2,7 +2,7 @@
 
   <%= render partial: 'toolbar/home' %>
 
-  <section class="edit_site_client" id="edit_<%= dom_id @client %>">
+  <section class="edit_site_client" id="edit_<%= dom_id resource %>">
     <% if params[:step].present? %>
       <%= render partial: "edit_step_#{ params[:step] }" %>
     <% else %>

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

@@ -5,55 +5,24 @@
   <section class="site_clients">
     <header>
       <h3>
-        <%= link_to t('site.client.new.link'), new_site_client_path, class: "new_site_client-modal-link", 'data-toggle' => 'modal'  %>
+        <%= link_to t('site.client.new.link'), polymorphic_path(resource_class.new, action: 'new'), class: "new_site_client-modal-link", 'data-toggle' => 'modal'  %>
         
-        <%= t 'site.client.added' %>
+        Applications
       </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>
-
+        <li class="active"><a href="#tab1" data-toggle="tab">Managing</a></li>
+      </ul>  
+    </div>
 
-      <div class="tab-content">
-        <div class="tab-pane active" id="tab1">
-          <%= render partial: 'list',
-               object: @clients %>
-        </div>
 
-        <div class="tab-pane" id="tab2">
-        </div>
+    <div class="tab-content">
+      <div class="tab-pane active" id="tab1">
+        <%= render partial: 'list',
+                   object: collection %>
       </div>
     </div>
-
     <%= render partial: 'new.modal' %>
-
-    <hr class="soften">
   </section>
 </section>

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

@@ -1,14 +1,15 @@
 <section id="site_client">
   <%= render partial: 'toolbar/home' %>
 
-  <section class="site_client" id="<%= dom_id @client %>">
+  <section class="site_client" id="<%= dom_id resource %>">
     <header>  
-      <h1>
-        <%= @client.name %>
-        <a class="go-more" href="#">
-          ir a tus demás aplicaciones
-        </a>
-      </h1>
+      <h4>
+        <%= resource.name %>
+
+        <% if can?(:update, resource) %>
+          <%= link_to t('site.client.button.edit'), polymorphic_path(resource, action: 'edit'), class: "edit" %>
+        <% end %>
+      </h4>
 
       <%= image_tag('logos/app-default.png', class: "logo-app pull-right") %>
 
@@ -20,53 +21,63 @@
           <%= Site::Client.human_attribute_name :description %>
         </h4>
         <div class="result">
-          <%= @client.description%>
+          <%= resource.description%>
         </div>
 
         <h4>
           <%= Site::Client.human_attribute_name :url %>
         </h4>
         <div class="result">
-          <%= link_to @client.url, @client.url%>
+          <%= link_to resource.url, resource.url%>
         </div>
 
-        <% if can? :update, @client %>
+        <% if can? :update, resource %>
           <h4>
             <%= Site::Client.human_attribute_name :callback_url %>
           </h4>
           <div class="result">
-            <%= @client.callback_url %>
+            <%= resource.callback_url %>
           </div>
         <% end %>
       </div>
         
-      <% if can? :update, @client %>
-        <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 %>
-              </h6>
-              <p>
-                <%= @client.id %>
-              </p>
-            </li>
-
-            <li class="client-secret">
-              <h6>
-                <%= Site::Client.human_attribute_name :secret %>
-                <a href="#" class="pull-right">refresh</a>
-              </h6>
-              <p>
-                <%= @client.secret %>
-              </p>
-            </li>
-          </ul>  
-        </div>   
+      <% if can? :update_secret, resource %>
+        <div class="accordion" id="accordion2">
+          <div class="accordion-group">
+            <div class="accordion-heading">
+              <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+                <%= t 'site.client.oauth.credentials' %>
+              </a>
+            </div>
+            <div id="collapseOne" class="accordion-body collapse">
+              <div class="accordion-inner">
+                <div class="content settings_content collapse in">
+                  <div class="result">
+                    <div class="client-id">
+                      <h6>
+                        <%= Site::Client.human_attribute_name :id %>
+                      </h6>
+                      <p>
+                        <%= resource.id %>
+                      </p>
+                    </div>
+                    <div class="client-secret">
+                      <h6>
+                        <%= Site::Client.human_attribute_name :secret %>
+                        <%= form_tag update_secret_site_client_path(resource, format: :json), class: "site-client-secret" do %>
+                          <%= submit_tag t('site.client.oauth.secret.refresh'), class: 'pull-right' %>
+                        <% end %>
+                      </h6>
+                      <p>
+                        <span class="site-client-secret"><%= resource.secret %></span>
+                      </p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
       <% end %>
     </div>
   </section>
@@ -74,48 +85,35 @@
   <div class="tabbable"> <!-- Only required for left/right tabs -->
     <ul class="nav nav-tabs">
       <li class="active"><a href="#authorized" data-toggle="tab">Authorized</a></li>
-      <li><a href="#registered" data-toggle="tab">Registered</a></li>
-      <li><a href="#stats" data-toggle="tab">Stats</a></li>
+      <li><a href="#registered" data-toggle="tab">Users</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>
+    
+    <%= render partial: 'contacts/add_button',
+               locals: {
+                 sender: resource,
+                 type: [ :user, :group ]
+               }
+    %>
+
+    <div class="btn-group" data-toggle="buttons">
+      <button type="radio" name="options" id="option1">user</button>
+      <button type="radio" name="options" id="option2"">organization</button>
     </div>
 
+     <%= text_field_tag "contact-filter", "", placeholder: "filter", autocomplete: "off" %>
 
     <div class="tab-content">
       <div class="tab-pane active" id="authorized">
         <%= render partial: 'contacts/contact',
-                   collection: @client.sent_contacts.first(12) %>
+                   collection: resource.sent_contacts.first(12) %>
       </div>
 
       <div class="tab-pane" id="registered">
       </div>
-
-      <div class="tab-pane" id="stats">
-      </div>
     </div>
   </div>
 
+  <%= javascript_tag do %>
+    SocialStream.SiteClient.show();
+  <% end %>
 </section>

data/config/locales/en.yml

@@ -33,6 +33,9 @@ en:
             relation/custom: Manage roles
         detailed:
           manage:
+            contact:
+              negative: They WILL NOT BE ABLE to assign roles to users
+              positive: They WILL BE ABLE to assign roles to users
             nil:
               positive: They WILL BE ABLE to update the details of the client site
               negative: They WILL NOT BE ABLE to update the details of the client
@@ -45,11 +48,27 @@ en:
     public_info: Read your public information
   relation_admin:
     name: Site Client Admin
+  relation_manager:
+    name: Manager
   site:
     client:
       added: Added sites
+      button:
+        edit: Edit
+      contact:
+        add: Add
+      destroy:
+        confirm: Are you sure? This operation cannot be reverted!
+        link: Remove the site client and all its data
+        title: Destroy site client
+      go_to_other: See your other site clients
       index:
         title: Client sites
       new:
         link: Add site
         title: Register new client site
+      oauth:
+        credentials: Credentials
+        secret:
+          refresh: refresh
+          refreshed: OAuth2 client secret regenerated

data/config/locales/es.yml

@@ -15,9 +15,9 @@ es:
       accept: Accept
       cancel: Cancel
     new:
-      title: Authorize %{client}?
       permission:
         title: 'The site %{client} will be able to:'
+      title: Authorize %{client}?
   helpers:
     submit:
       site_client:
@@ -28,25 +28,44 @@ es:
       default:
         brief:
           manage:
+            contact: Manage authorizations
             nil: Gestionar el sitio
             relation/custom: Gestionar los roles
-            contact: Manage authorizations
         detailed:
           manage:
+            contact:
+              negative: NO PODRÁN asignar roles a usuarios
+              positive: PODRÁN asignar roles a usuarios
             nil:
-              positive: PODRÁN actualizar los detalles del sitio
               negative: NO PODRÁN actualizar los detalles del sitio
+              positive: PODRÁN actualizar los detalles del sitio
             relation/custom:
-              positive: PODRÁN crear, actualizar y borrar los roles del sitio
               negative: NO PODRÁN crear, actualizar y borrar los roles del sitio
+              positive: PODRÁN crear, actualizar y borrar los roles del sitio
     public_info: Acceder a tu información pública
   relation_admin:
     name: Administrador de Sitio
+  relation_manager:
+    name: Admin
   site:
     client:
       added: Sitios añadidos
+      button:
+        edit: Editar
+      contact:
+        add: Add
+      destroy:
+        confirm: Are you sure? This operation cannot be reverted!
+        link: Remove the site client and all its data
+        title: Destroy site client
+      go_to_other: Ver tus otros sitios
       index:
         title: Sitios
       new:
         link: Añadir sitio
         title: Registrar nuevo sitio
+      oauth:
+        credentials: Credenciales
+        secret:
+          refresh: regenerar
+          refreshed: Token secreto de OAuth2 regenerado

data/config/locales/zh.yml

@@ -15,41 +15,60 @@ zh:
       accept: Accept
       cancel: Cancel
     new:
-      title: Authorize %{client}?
       permission:
         title: 'The site %{client} will be able to:'
+      title: Authorize %{client}?
+  helpers:
+    submit:
+      site_client:
+        create: Next
+        update: Save
   permission:
-    public_info: Read your public information
     description:
       default:
         brief:
           manage:
+            contact: Manage authorizations
             nil: Manage the site
             relation/custom: Manage roles
-            contact: Manage authorizations
         detailed:
           manage:
+            contact:
+              negative: They WILL NOT BE ABLE to assign roles to users
+              positive: They WILL BE ABLE to assign roles to users
             nil:
-              positive: They WILL BE ABLE to update the details of the client site
               negative: They WILL NOT BE ABLE to update the details of the client
                 site
+              positive: They WILL BE ABLE to update the details of the client site
             relation/custom:
-              positive: They WILL BE ABLE to create, update and delete the roles of
-                the client site
               negative: They WILL NOT BE ABLE to create, update and delete the roles
                 of the client site
+              positive: They WILL BE ABLE to create, update and delete the roles of
+                the client site
+    public_info: Read your public information
+  relation_admin:
+    name: Site Client Admin
+  relation_manager:
+    name: Manager
   site:
     client:
       added: Added sites
+      button:
+        edit: Edit
+      contact:
+        add: Add
+      destroy:
+        confirm: Are you sure? This operation cannot be reverted!
+        link: Remove the site client and all its data
+        title: Destroy site client
+      go_to_other: See your other site clients
       index:
         title: Client sites
       new:
         link: Add site
         title: Register new client site
-  helpers:
-    submit:
-      site_client:
-        create: Next
-        update: Save
-  relation_admin:
-    name: Site Client Admin
+      oauth:
+        credentials: Credentials
+        secret:
+          refresh: refresh
+          refreshed: OAuth2 client secret regenerated

data/config/routes.rb

@@ -5,6 +5,8 @@ Rails.application.routes.draw do
   resources :authorizations, only: :create
 
   namespace "site" do
-    resources :clients
+    resources :clients do
+      post :update_secret, on: :member
+    end
   end
 end

data/lib/social_stream/oauth2_server.rb

@@ -17,11 +17,14 @@ module SocialStream
     autoload :TokenEndpoint, 'social_stream/oauth2_server/token_endpoint'
   end
 
+  # Include site/client in routes
+  SocialStream.routed_subjects << :"site/client"
+
   # Define default custom relations for Site::Client
   SocialStream.custom_relations['site/client'] = {}
 
   # Relations that appear in the Site::Client list
-  SocialStream.list_relations['site/client'] = [ :manager ]
+  SocialStream.system_relations['site/client'] = [ :manager ]
 
   SocialStream.available_permissions['site/client'] = [
     [ 'manage', nil ],

data/lib/social_stream/oauth2_server/ability.rb

@@ -11,7 +11,7 @@ module SocialStream
             c.author_id == subject.actor_id
         end
 
-        can [:update, :destroy], Site::Client do |c|
+        can [:update, :update_secret, :destroy], Site::Client do |c|
           c.allow? subject, 'manage'
         end
 

data/lib/social_stream/oauth2_server/models/user.rb

@@ -16,6 +16,8 @@ module SocialStream
 
           has_many :refresh_tokens,
                    class_name: 'Oauth2Token::RefreshToken'
+
+          alias_method_chain :as_json, :client
         end
 
         # Is {#client} authorized by this {User}
@@ -29,6 +31,22 @@ module SocialStream
             contact_to!(client).relation_ids += [ Relation::Auth.instance.id ]
           end
         end
+
+        # Include application role information in the json
+        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
       end
     end
   end

data/lib/social_stream/oauth2_server/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Oauth2Server
-    VERSION = "2.1.1".freeze
+    VERSION = "2.2.0".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.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/spec/controllers/site_clients_controller_authorization_spec.rb

@@ -38,6 +38,13 @@ describe Site::ClientsController do
       sign_in @user
     end
 
+    it "should render index" do
+      @client = Factory(:"site/client", author: @user.actor )
+      get :index
+
+      response.should be_success
+    end
+
     it "should render client" do
       @client = Factory(:"site/client", author: @user.actor )
       get :show, :id => @client.to_param

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-oauth2_server
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-01 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.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,7 @@ files:
 - app/assets/images/logos/small/site.png
 - app/assets/images/step_1.png
 - app/assets/images/step_2.png
+- app/assets/images/step_3.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
@@ -93,6 +94,7 @@ files:
 - app/controllers/authorizations_controller.rb
 - app/controllers/site/clients_controller.rb
 - app/decorators/social_stream/base/actor_decorator.rb
+- app/decorators/social_stream/base/relation_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
@@ -108,6 +110,7 @@ files:
 - app/views/authorizations/error.html.erb
 - app/views/authorizations/new.html.erb
 - app/views/site/clients/_avatar.html.erb
+- app/views/site/clients/_destroy.html.erb
 - app/views/site/clients/_edit.html.erb
 - app/views/site/clients/_edit_step_2.html.erb
 - app/views/site/clients/_edit_step_3.html.erb
@@ -164,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: OAuth2 server support for Social Stream, the framework for building social