adding authentication and entity mananegement

Leandro Santos
1 parent b0658885
Showing 10 changed files with 302 additions and 37 deletions Show diff stats
app/models/article.rb
app/models/user.rb
db/migrate/20140407013817_add_private_token_info_to_users.rb
lib/api/api.rb
lib/api/entities.rb
lib/api/helpers.rb
lib/api/session.rb
lib/api/v1/articles.rb
lib/api/v1/comments.rb
lib/api/v1/users.rb
@@ -790,12 +790,6 @@ class Article &lt; ActiveRecord::Base
     true
   end
-  #FIXME make this test
-  #Define which parameters will be returned in json object
-  def as_json(options = {})
-    super(:only => [:id, :name, :body, :created_at], :methods => [:title])
-  end
-
   private
   def sanitize_tag_list
 require 'digest/sha1'
 require 'user_activation_job'
+require 'securerandom'
 # User models the system users, and is generated by the acts_as_authenticated
 # Rails generator.
@@ -119,6 +120,18 @@ class User &lt; ActiveRecord::Base
     self.update_attribute :last_login_at, Time.now
   end
+  #FIXME make this test
+  def generate_private_token!
+    self.private_token = SecureRandom.hex
+    self.private_token_generated_at = DateTime.now
+    save(false)
+  end
+
+  #FIXME make this test
+  def private_token_expired?
+    self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now)
+  end
+
   # Activates the user in the database.
   def activate
     return false unless self.person
 class AddPrivateTokenInfoToUsers < ActiveRecord::Migration
   def self.up
-    add_column :users, :private_token
+    add_column :users, :private_token, :string
     add_column :users, :private_token_generated_at, :datetime
   end
 require 'grape'
+Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
 module API
   class API < Grape::API
@@ -9,10 +10,10 @@ module API
     mount V1::Articles
     mount V1::Comments
+    mount V1::Users
+    mount Session
-#    helpers APIHelpers
-
-#    require Articles
+    helpers APIHelpers
   end
 end
@@ -0,0 +1,27 @@
+module API
+  module Entities
+    class Article < Grape::Entity
+      expose :id, :name, :body, :created_at
+#      expose :is_admin?, as: :is_admin
+
+#      expose :avatar_url do |user, options|
+#        if user.avatar.present?
+#          user.avatar.url
+#        end
+#      end
+    end
+
+    class Comment < Grape::Entity
+      expose :author_id, :body, :title, :created_at
+    end
+
+    class User < Grape::Entity
+      expose :login
+    end
+
+    class UserLogin < User
+      expose :private_token
+    end
+
+  end
+end
@@ -0,0 +1,108 @@
+module API
+  module APIHelpers
+    PRIVATE_TOKEN_PARAM = :private_token
+
+    def current_user
+      private_token = params[PRIVATE_TOKEN_PARAM].to_s
+      @current_user ||= User.find_by_private_token(private_token)
+      @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
+      @current_user
+    end
+
+    def logout
+      @current_user = nil
+    end
+
+
+#    def paginate(relation)
+#      per_page  = params[:per_page].to_i
+#      paginated = relation.page(params[:page]).per(per_page)
+#      add_pagination_headers(paginated, per_page)
+#
+#      paginated
+#    end
+
+    def authenticate!
+      unauthorized! unless current_user
+    end
+
+#    def authenticated_as_admin!
+#      forbidden! unless current_user.is_admin?
+#    end
+#
+#    def authorize! action, subject
+#      unless abilities.allowed?(current_user, action, subject)
+#        forbidden!
+#      end
+#    end
+#
+#    def can?(object, action, subject)
+#      abilities.allowed?(object, action, subject)
+#    end
+
+    # Checks the occurrences of required attributes, each attribute must be present in the params hash
+    # or a Bad Request error is invoked.
+    #
+    # Parameters:
+    #   keys (required) - A hash consisting of keys that must be present
+    def required_attributes!(keys)
+      keys.each do |key|
+        bad_request!(key) unless params[key].present?
+      end
+    end
+
+    def attributes_for_keys(keys)
+      attrs = {}
+      keys.each do |key|
+        attrs[key] = params[key] if params[key].present? or (params.has_key?(key) and params[key] == false)
+      end
+      attrs
+    end
+
+    # error helpers
+
+    def forbidden!
+      render_api_error!('403 Forbidden', 403)
+    end
+
+    def bad_request!(attribute)
+      message = ["400 (Bad request)"]
+      message << "\"" + attribute.to_s + "\" not given"
+      render_api_error!(message.join(' '), 400)
+    end
+
+    def not_found!(resource = nil)
+      message = ["404"]
+      message << resource if resource
+      message << "Not Found"
+      render_api_error!(message.join(' '), 404)
+    end
+
+    def unauthorized!
+      render_api_error!('401 Unauthorized', 401)
+    end
+
+    def not_allowed!
+      render_api_error!('Method Not Allowed', 405)
+    end
+
+    def render_api_error!(message, status)
+      error!({'message' => message}, status)
+    end
+
+#    private
+#
+#    def add_pagination_headers(paginated, per_page)
+#      request_url = request.url.split('?').first
+#
+#      links = []
+#      links << %(<#{request_url}?page=#{paginated.current_page - 1}&per_page=#{per_page}>; rel="prev") unless paginated.first_page?
+#      links << %(<#{request_url}?page=#{paginated.current_page + 1}&per_page=#{per_page}>; rel="next") unless paginated.last_page?
+#      links << %(<#{request_url}?page=1&per_page=#{per_page}>; rel="first")
+#      links << %(<#{request_url}?page=#{paginated.total_pages}&per_page=#{per_page}>; rel="last")
+#
+#      header 'Link', links.join(', ')
+#    end
+
+  end
+end
@@ -0,0 +1,60 @@
+module API
+
+#   require 'api/validations/uniqueness'
+
+  # Users API
+  class Session < Grape::API
+#params do
+#  requires :login, :uniqueness => true
+#end
+
+    # Login to get token
+    #
+    # Parameters:
+    #   login (*required) - user login or email
+    #   password (required) - user password
+    #
+    # Example Request:
+    #  POST /session
+    get "/login" do
+#    post "/session" do
+environment = nil #FIXME load the correct environment create a method in helper
+      user ||= User.authenticate(params[:login], params[:password], environment)
+
+      return unauthorized! unless user
+      user.generate_private_token!
+      present user, :with => Entities::UserLogin
+    end
+
+      # Create user.
+      #
+      # Parameters:
+      #   email (required)                  - Email
+      #   password (required)               - Password
+      #   name                              - Name
+      # Example Request:
+      #   POST /users
+#      post do
+      get "register" do
+        required_attributes! [:email, :login, :password]
+        attrs = attributes_for_keys [:email, :login, :password]
+        attrs[:password_confirmation] = attrs[:password]
+        user = User.new(attrs)
+begin
+        if user.save
+          present user, :with => Entities::User
+        else
+          not_found!
+        end
+rescue
+#          not_found!
+#FIXME See  why notfound is not working
+{}
+end
+#        user
+      end
+
+
+
+  end
+end
 module API
   module V1
-  class Articles < Grape::API
- 
-    resource :articles do
+    class Articles < Grape::API
-      get do
-        first_update = DateTime.parse(params[:first_update]) if params[:first_update]
-        last_update = DateTime.parse(params[:last_update]) if params[:last_update]
+      before { authenticate! }
+   
+      resource :articles do
-        if first_update.nil?
-          begin_date = Article.first.created_at
-          end_date = last_update.nil? ? DateTime.now : last_update
-        else
-          begin_date = first_update
-          end_date = DateTime.now
+        #FIXME See if it's possible to use pagination instead of DateTime control. see a way to use this pagination logic genericaly
+        get do
+          first_update = DateTime.parse(params[:first_update]) if params[:first_update]
+          last_update = DateTime.parse(params[:last_update]) if params[:last_update]
+  
+          if first_update.nil?
+            begin_date = Article.first.created_at
+            end_date = last_update.nil? ? DateTime.now : last_update
+          else
+            begin_date = first_update
+            end_date = DateTime.now
+          end
+  
+          limit = params[:limit].to_i
+          limit = 20 if limit == 0
+          conditions = {}
+          conditions[:type] = params[:content_type] if params[:content_type] #FIXME validate type
+          conditions[:created_at] = begin_date...end_date
+          present Article.find(:all, :conditions => conditions, :offset => (first_update.nil? ? 0 : 1), :limit => limit, :order => "created_at DESC"), :with => Entities::Article
+        end
+  
+        #FIXME load article with environment context 
+        get ':id' do
+          present Article.find(params[:id]), :with => Entities::Article
         end
-        limit = params[:limit].to_i
-        limit = 20 if limit == 0
-        conditions = {}
-        conditions[:type] = params[:content_type] if params[:content_type] #FIXME validate type
-        conditions[:created_at] = begin_date...end_date
-        Article.find(:all, :conditions => conditions, :offset => (first_update.nil? ? 0 : 1), :limit => limit, :order => "created_at DESC")
-      end
- 
-      get ':id' do
-        Article.find(params[:id])
+        #FIXME load article with environment context 
+        get ':id/children' do
+          present Article.find(params[:id]).children, :with => Entities::Article
+        end
+
+        #FIXME load article with environment context 
+        get ':id/children/:child_id' do
+          present Article.find(params[:id]).children.find(params[:child_id]), :with => Entities::Article
+        end
+
+
       end
+   
     end
- 
-  end
   end
 end
 module API
   module V1
   class Comments < Grape::API
+
+    before { authenticate! }
     resource :articles do
-
+      #FIXME make the pagination
+      #FIXME put it on environment context
       get ":id/comments" do
-        Article.find(params[:id]).comments
+        present Article.find(params[:id]).comments, :with => Entities::Comment
       end
       get ":id/comments/:comment_id" do
-        Article.find(params[:id]).comments.find(params[:comment_id])
+        present Article.find(params[:id]).comments.find(params[:comment_id]), :with => Entities::Comment
       end
     end
@@ -0,0 +1,43 @@
+module API
+  module V1
+  class Users < Grape::API
+ 
+    before { authenticate! }
+
+    resource :users do
+
+      #FIXME make the pagination
+      #FIXME put it on environment context
+#      get do
+#        Users.all
+#      end
+ 
+      get ":id" do
+        present Article.find(params[:id]).comments.find(params[:comment_id]), :with => Entities::User
+      end
+
+      # Create user.
+      #
+      # Parameters:
+      #   email (required)                  - Email
+      #   password (required)               - Password
+      #   name                              - Name
+      # Example Request:
+      #   POST /users
+#      post do
+      get do
+#        authenticated_as_admin!
+        required_attributes! [:email, :login, :password]
+        attrs = attributes_for_keys [:email, :login, :password]
+        user = User.new(attrs)
+        if user.save
+          present user, :with => Entities::User
+        else
+          not_found!
+        end
+      end
+    end
+ 
+  end
+  end
+end
	@@ -790,12 +790,6 @@ class Article < ActiveRecord::Base		@@ -790,12 +790,6 @@ class Article < ActiveRecord::Base
790	true	790	true
791	end	791	end
792		792
793	- #FIXME make this test
794	- #Define which parameters will be returned in json object
795	- def as_json(options = {})
796	- super(:only => [:id, :name, :body, :created_at], :methods => [:title])
797	- end
798	-
799	private	793	private
800		794
801	def sanitize_tag_list	795	def sanitize_tag_list
1	require 'digest/sha1'	1	require 'digest/sha1'
2	require 'user_activation_job'	2	require 'user_activation_job'
		3	+require 'securerandom'
3		4
4	# User models the system users, and is generated by the acts_as_authenticated	5	# User models the system users, and is generated by the acts_as_authenticated
5	# Rails generator.	6	# Rails generator.
	@@ -119,6 +120,18 @@ class User < ActiveRecord::Base		@@ -119,6 +120,18 @@ class User < ActiveRecord::Base
119	self.update_attribute :last_login_at, Time.now	120	self.update_attribute :last_login_at, Time.now
120	end	121	end
121		122
		123	+ #FIXME make this test
		124	+ def generate_private_token!
		125	+ self.private_token = SecureRandom.hex
		126	+ self.private_token_generated_at = DateTime.now
		127	+ save(false)
		128	+ end
		129	+
		130	+ #FIXME make this test
		131	+ def private_token_expired?
		132	+ self.generate_private_token! if self.private_token.nil? \|\| (self.private_token_generated_at + 2.weeks < DateTime.now)
		133	+ end
		134	+
122	# Activates the user in the database.	135	# Activates the user in the database.
123	def activate	136	def activate
124	return false unless self.person	137	return false unless self.person
1	class AddPrivateTokenInfoToUsers < ActiveRecord::Migration	1	class AddPrivateTokenInfoToUsers < ActiveRecord::Migration
2	def self.up	2	def self.up
3	- add_column :users, :private_token	3	+ add_column :users, :private_token, :string
4	add_column :users, :private_token_generated_at, :datetime	4	add_column :users, :private_token_generated_at, :datetime
5	end	5	end
6		6
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+module API
	2	+ module Entities
	3	+ class Article < Grape::Entity
	4	+ expose :id, :name, :body, :created_at
	5	+# expose :is_admin?, as: :is_admin
	6	+
	7	+# expose :avatar_url do \|user, options\|
	8	+# if user.avatar.present?
	9	+# user.avatar.url
	10	+# end
	11	+# end
	12	+ end
	13	+
	14	+ class Comment < Grape::Entity
	15	+ expose :author_id, :body, :title, :created_at
	16	+ end
	17	+
	18	+ class User < Grape::Entity
	19	+ expose :login
	20	+ end
	21	+
	22	+ class UserLogin < User
	23	+ expose :private_token
	24	+ end
	25	+
	26	+ end
	27	+end
@@ -0,0 +1,108 @@		@@ -0,0 +1,108 @@
	1	+module API
	2	+ module APIHelpers
	3	+ PRIVATE_TOKEN_PARAM = :private_token
	4	+
	5	+ def current_user
	6	+ private_token = params[PRIVATE_TOKEN_PARAM].to_s
	7	+ @current_user \|\|= User.find_by_private_token(private_token)
	8	+ @current_user = nil if !@current_user.nil? && @current_user.private_token_expired?
	9	+ @current_user
	10	+ end
	11	+
	12	+ def logout
	13	+ @current_user = nil
	14	+ end
	15	+
	16	+
	17	+# def paginate(relation)
	18	+# per_page = params[:per_page].to_i
	19	+# paginated = relation.page(params[:page]).per(per_page)
	20	+# add_pagination_headers(paginated, per_page)
	21	+#
	22	+# paginated
	23	+# end
	24	+
	25	+ def authenticate!
	26	+ unauthorized! unless current_user
	27	+ end
	28	+
	29	+# def authenticated_as_admin!
	30	+# forbidden! unless current_user.is_admin?
	31	+# end
	32	+#
	33	+# def authorize! action, subject
	34	+# unless abilities.allowed?(current_user, action, subject)
	35	+# forbidden!
	36	+# end
	37	+# end
	38	+#
	39	+# def can?(object, action, subject)
	40	+# abilities.allowed?(object, action, subject)
	41	+# end
	42	+
	43	+ # Checks the occurrences of required attributes, each attribute must be present in the params hash
	44	+ # or a Bad Request error is invoked.
	45	+ #
	46	+ # Parameters:
	47	+ # keys (required) - A hash consisting of keys that must be present
	48	+ def required_attributes!(keys)
	49	+ keys.each do \|key\|
	50	+ bad_request!(key) unless params[key].present?
	51	+ end
	52	+ end
	53	+
	54	+ def attributes_for_keys(keys)
	55	+ attrs = {}
	56	+ keys.each do \|key\|
	57	+ attrs[key] = params[key] if params[key].present? or (params.has_key?(key) and params[key] == false)
	58	+ end
	59	+ attrs
	60	+ end
	61	+
	62	+ # error helpers
	63	+
	64	+ def forbidden!
	65	+ render_api_error!('403 Forbidden', 403)
	66	+ end
	67	+
	68	+ def bad_request!(attribute)
	69	+ message = ["400 (Bad request)"]
	70	+ message << "\"" + attribute.to_s + "\" not given"
	71	+ render_api_error!(message.join(' '), 400)
	72	+ end
	73	+
	74	+ def not_found!(resource = nil)
	75	+ message = ["404"]
	76	+ message << resource if resource
	77	+ message << "Not Found"
	78	+ render_api_error!(message.join(' '), 404)
	79	+ end
	80	+
	81	+ def unauthorized!
	82	+ render_api_error!('401 Unauthorized', 401)
	83	+ end
	84	+
	85	+ def not_allowed!
	86	+ render_api_error!('Method Not Allowed', 405)
	87	+ end
	88	+
	89	+ def render_api_error!(message, status)
	90	+ error!({'message' => message}, status)
	91	+ end
	92	+
	93	+# private
	94	+#
	95	+# def add_pagination_headers(paginated, per_page)
	96	+# request_url = request.url.split('?').first
	97	+#
	98	+# links = []
	99	+# links << %(<#{request_url}?page=#{paginated.current_page - 1}&per_page=#{per_page}>; rel="prev") unless paginated.first_page?
	100	+# links << %(<#{request_url}?page=#{paginated.current_page + 1}&per_page=#{per_page}>; rel="next") unless paginated.last_page?
	101	+# links << %(<#{request_url}?page=1&per_page=#{per_page}>; rel="first")
	102	+# links << %(<#{request_url}?page=#{paginated.total_pages}&per_page=#{per_page}>; rel="last")
	103	+#
	104	+# header 'Link', links.join(', ')
	105	+# end
	106	+
	107	+ end
	108	+end
@@ -0,0 +1,60 @@		@@ -0,0 +1,60 @@
	1	+module API
	2	+
	3	+# require 'api/validations/uniqueness'
	4	+
	5	+ # Users API
	6	+ class Session < Grape::API
	7	+#params do
	8	+# requires :login, :uniqueness => true
	9	+#end
	10	+
	11	+ # Login to get token
	12	+ #
	13	+ # Parameters:
	14	+ # login (*required) - user login or email
	15	+ # password (required) - user password
	16	+ #
	17	+ # Example Request:
	18	+ # POST /session
	19	+ get "/login" do
	20	+# post "/session" do
	21	+environment = nil #FIXME load the correct environment create a method in helper
	22	+ user \|\|= User.authenticate(params[:login], params[:password], environment)
	23	+
	24	+ return unauthorized! unless user
	25	+ user.generate_private_token!
	26	+ present user, :with => Entities::UserLogin
	27	+ end
	28	+
	29	+ # Create user.
	30	+ #
	31	+ # Parameters:
	32	+ # email (required) - Email
	33	+ # password (required) - Password
	34	+ # name - Name
	35	+ # Example Request:
	36	+ # POST /users
	37	+# post do
	38	+ get "register" do
	39	+ required_attributes! [:email, :login, :password]
	40	+ attrs = attributes_for_keys [:email, :login, :password]
	41	+ attrs[:password_confirmation] = attrs[:password]
	42	+ user = User.new(attrs)
	43	+begin
	44	+ if user.save
	45	+ present user, :with => Entities::User
	46	+ else
	47	+ not_found!
	48	+ end
	49	+rescue
	50	+# not_found!
	51	+#FIXME See why notfound is not working
	52	+{}
	53	+end
	54	+# user
	55	+ end
	56	+
	57	+
	58	+
	59	+ end
	60	+end
1	module API	1	module API
2	module V1	2	module V1
3	- class Articles < Grape::API
4	-
5	- resource :articles do	3	+ class Articles < Grape::API
6		4
7	- get do
8	- first_update = DateTime.parse(params[:first_update]) if params[:first_update]
9	- last_update = DateTime.parse(params[:last_update]) if params[:last_update]	5	+ before { authenticate! }
		6	+
		7	+ resource :articles do
10		8
11	- if first_update.nil?
12	- begin_date = Article.first.created_at
13	- end_date = last_update.nil? ? DateTime.now : last_update
14	- else
15	- begin_date = first_update
16	- end_date = DateTime.now	9	+ #FIXME See if it's possible to use pagination instead of DateTime control. see a way to use this pagination logic genericaly
		10	+ get do
		11	+ first_update = DateTime.parse(params[:first_update]) if params[:first_update]
		12	+ last_update = DateTime.parse(params[:last_update]) if params[:last_update]
		13	+
		14	+ if first_update.nil?
		15	+ begin_date = Article.first.created_at
		16	+ end_date = last_update.nil? ? DateTime.now : last_update
		17	+ else
		18	+ begin_date = first_update
		19	+ end_date = DateTime.now
		20	+ end
		21	+
		22	+ limit = params[:limit].to_i
		23	+ limit = 20 if limit == 0
		24	+ conditions = {}
		25	+ conditions[:type] = params[:content_type] if params[:content_type] #FIXME validate type
		26	+ conditions[:created_at] = begin_date...end_date
		27	+ present Article.find(:all, :conditions => conditions, :offset => (first_update.nil? ? 0 : 1), :limit => limit, :order => "created_at DESC"), :with => Entities::Article
		28	+ end
		29	+
		30	+ #FIXME load article with environment context
		31	+ get ':id' do
		32	+ present Article.find(params[:id]), :with => Entities::Article
17	end	33	end
18		34
19	- limit = params[:limit].to_i
20	- limit = 20 if limit == 0
21	- conditions = {}
22	- conditions[:type] = params[:content_type] if params[:content_type] #FIXME validate type
23	- conditions[:created_at] = begin_date...end_date
24	- Article.find(:all, :conditions => conditions, :offset => (first_update.nil? ? 0 : 1), :limit => limit, :order => "created_at DESC")
25	- end
26	-
27	- get ':id' do
28	- Article.find(params[:id])	35	+ #FIXME load article with environment context
		36	+ get ':id/children' do
		37	+ present Article.find(params[:id]).children, :with => Entities::Article
		38	+ end
		39	+
		40	+ #FIXME load article with environment context
		41	+ get ':id/children/:child_id' do
		42	+ present Article.find(params[:id]).children.find(params[:child_id]), :with => Entities::Article
		43	+ end
		44	+
		45	+
29	end	46	end
		47	+
30	end	48	end
31	-
32	- end
33	end	49	end
34	end	50	end
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+module API
	2	+ module V1
	3	+ class Users < Grape::API
	4	+
	5	+ before { authenticate! }
	6	+
	7	+ resource :users do
	8	+
	9	+ #FIXME make the pagination
	10	+ #FIXME put it on environment context
	11	+# get do
	12	+# Users.all
	13	+# end
	14	+
	15	+ get ":id" do
	16	+ present Article.find(params[:id]).comments.find(params[:comment_id]), :with => Entities::User
	17	+ end
	18	+
	19	+ # Create user.
	20	+ #
	21	+ # Parameters:
	22	+ # email (required) - Email
	23	+ # password (required) - Password
	24	+ # name - Name
	25	+ # Example Request:
	26	+ # POST /users
	27	+# post do
	28	+ get do
	29	+# authenticated_as_admin!
	30	+ required_attributes! [:email, :login, :password]
	31	+ attrs = attributes_for_keys [:email, :login, :password]
	32	+ user = User.new(attrs)
	33	+ if user.save
	34	+ present user, :with => Entities::User
	35	+ else
	36	+ not_found!
	37	+ end
	38	+ end
	39	+ end
	40	+
	41	+ end
	42	+ end
	43	+end