Merge branch 'angular_poc' into staging

Victor Costa
2 parents a7df1a64 fc162af5
Showing 4 changed files with 27 additions and 1 deletions Show diff stats
lib/noosfero/api/api.rb
lib/noosfero/api/session.rb
lib/noosfero/api/v1/articles.rb
lib/noosfero/api/v1/profiles.rb
@@ -55,6 +55,7 @@ module Noosfero
       mount V1::Search
       mount V1::Contacts
       mount V1::Boxes
+      mount V1::Profiles
  
       mount Session
  
@@ -45,6 +45,7 @@ module Noosfero
       end
  
       post "/login_from_cookie" do
+        return unauthorized! if cookies[:auth_token].blank?
         user = User.where(remember_token: cookies[:auth_token]).first
         return unauthorized! unless user && user.activated?
         @current_user = user
@@ -260,7 +260,7 @@ module Noosfero
  
         end
  
-        kinds = %w[community person enterprise]
+        kinds = %w[profile community person enterprise]
         kinds.each do |kind|
           resource kind.pluralize.to_sym do
             segment "/:#{kind}_id" do
@@ -0,0 +1,24 @@
+module Noosfero
+  module API
+    module V1
+      class Profiles < Grape::API
+        before { authenticate! }
+
+        resource :profiles do
+
+          get do
+            profiles = select_filtered_collection_of(environment, 'profiles', params)
+            profiles = profiles.visible_for_person(current_person) if profiles.respond_to?(:visible_for_person)
+            profiles = profiles.by_location(params) # Must be the last. May return Exception obj.
+            present profiles, :with => Entities::Profile, :current_person => current_person
+          end
+
+          get ':id' do
+            profile = environment.profiles.visible_for_person(current_person).find_by_id(params[:id])
+            present profile, :with => Entities::Profile, :current_person => current_person
+          end
+        end
+      end
+    end
+  end
+end
...	...	@@ -55,6 +55,7 @@ module Noosfero
55	55	mount V1::Search
56	56	mount V1::Contacts
57	57	mount V1::Boxes
	58	+ mount V1::Profiles
58	59
59	60	mount Session
60	61
...	...
...	...	@@ -45,6 +45,7 @@ module Noosfero
45	45	end
46	46
47	47	post "/login_from_cookie" do
	48	+ return unauthorized! if cookies[:auth_token].blank?
48	49	user = User.where(remember_token: cookies[:auth_token]).first
49	50	return unauthorized! unless user && user.activated?
50	51	@current_user = user
...	...
...	...	@@ -260,7 +260,7 @@ module Noosfero
260	260
261	261	end
262	262
263		- kinds = %w[community person enterprise]
	263	+ kinds = %w[profile community person enterprise]
264	264	kinds.each do \|kind\|
265	265	resource kind.pluralize.to_sym do
266	266	segment "/:#{kind}_id" do
...	...
...	...	@@ -0,0 +1,24 @@
	1	+module Noosfero
	2	+ module API
	3	+ module V1
	4	+ class Profiles < Grape::API
	5	+ before { authenticate! }
	6	+
	7	+ resource :profiles do
	8	+
	9	+ get do
	10	+ profiles = select_filtered_collection_of(environment, 'profiles', params)
	11	+ profiles = profiles.visible_for_person(current_person) if profiles.respond_to?(:visible_for_person)
	12	+ profiles = profiles.by_location(params) # Must be the last. May return Exception obj.
	13	+ present profiles, :with => Entities::Profile, :current_person => current_person
	14	+ end
	15	+
	16	+ get ':id' do
	17	+ profile = environment.profiles.visible_for_person(current_person).find_by_id(params[:id])
	18	+ present profile, :with => Entities::Profile, :current_person => current_person
	19	+ end
	20	+ end
	21	+ end
	22	+ end
	23	+ end
	24	+end
...	...