Abilities added to /user and /sign_in requests

Alex Denisov
1 parent 6956f1f6
Showing 5 changed files with 16 additions and 4 deletions Show diff stats
lib/api/entities.rb
lib/api/projects.rb
lib/api/users.rb
spec/requests/api/session_spec.rb
spec/requests/api/users_spec.rb
@@ -15,6 +15,10 @@ module Gitlab
     class UserLogin < UserBasic
       expose :private_token
+      expose :is_admin?, as: :is_admin
+      expose :can_create_group?, as: :can_create_group
+      expose :can_create_project?, as: :can_create_project
+      expose :can_create_team?, as: :can_create_team
     end
     class Hook < Grape::Entity
@@ -31,7 +35,7 @@ module Gitlab
     end
     class ProjectMember < UserBasic
-      expose :project_access, :as => :access_level do |user, options|
+      expose :project_access, as: :access_level do |user, options|
         options[:project].users_projects.find_by_user_id(user.id).project_access
       end
     end
@@ -191,7 +191,7 @@ module Gitlab
         unless team_member.nil?
           team_member.destroy
         else
-          {:message => "Access revoked", :id => params[:user_id].to_i}
+          {message: "Access revoked", id: params[:user_id].to_i}
         end
       end
@@ -322,7 +322,7 @@ module Gitlab
         protected = user_project.protected_branches.find_by_name(@branch.name)
         unless protected
-          user_project.protected_branches.create(:name => @branch.name)
+          user_project.protected_branches.create(name: @branch.name)
         end
         present @branch, with: Entities::RepoObject, project: user_project
@@ -124,7 +124,7 @@ module Gitlab
       # Example Request:
       #   GET /user
       get do
-        present @current_user, with: Entities::User
+        present @current_user, with: Entities::UserLogin
       end
       # Get currently authenticated user's keys
@@ -13,6 +13,10 @@ describe Gitlab::API do
         json_response['email'].should == user.email
         json_response['private_token'].should == user.private_token
+        json_response['is_admin'].should == user.is_admin?
+        json_response['can_create_team'].should == user.can_create_team?
+        json_response['can_create_project'].should == user.can_create_project?
+        json_response['can_create_group'].should == user.can_create_group?
       end
     end
@@ -214,6 +214,10 @@ describe Gitlab::API do
       get api("/user", user)
       response.status.should == 200
       json_response['email'].should == user.email
+      json_response['is_admin'].should == user.is_admin?
+      json_response['can_create_team'].should == user.can_create_team?
+      json_response['can_create_project'].should == user.can_create_project?
+      json_response['can_create_group'].should == user.can_create_group?
     end
     it "should return 401 error if user is unauthenticated" do
	@@ -191,7 +191,7 @@ module Gitlab		@@ -191,7 +191,7 @@ module Gitlab
191	unless team_member.nil?	191	unless team_member.nil?
192	team_member.destroy	192	team_member.destroy
193	else	193	else
194	- {:message => "Access revoked", :id => params[:user_id].to_i}	194	+ {message: "Access revoked", id: params[:user_id].to_i}
195	end	195	end
196	end	196	end
197		197
	@@ -322,7 +322,7 @@ module Gitlab		@@ -322,7 +322,7 @@ module Gitlab
322	protected = user_project.protected_branches.find_by_name(@branch.name)	322	protected = user_project.protected_branches.find_by_name(@branch.name)
323		323
324	unless protected	324	unless protected
325	- user_project.protected_branches.create(:name => @branch.name)	325	+ user_project.protected_branches.create(name: @branch.name)
326	end	326	end
327		327
328	present @branch, with: Entities::RepoObject, project: user_project	328	present @branch, with: Entities::RepoObject, project: user_project
	@@ -124,7 +124,7 @@ module Gitlab		@@ -124,7 +124,7 @@ module Gitlab
124	# Example Request:	124	# Example Request:
125	# GET /user	125	# GET /user
126	get do	126	get do
127	- present @current_user, with: Entities::User	127	+ present @current_user, with: Entities::UserLogin
128	end	128	end
129		129
130	# Get currently authenticated user's keys	130	# Get currently authenticated user's keys