Fix groups api: differ between users and admin

lib/api/entities.rb

@@ -33,7 +33,7 @@ module Gitlab
     end
 
     class Group < Grape::Entity
-      expose :id, :name, :path, :name, :owner_id, :type
+      expose :id, :name, :path, :owner_id
     end
     
     class GroupDetail < Grape::Entity

lib/api/groups.rb

@@ -2,49 +2,55 @@ module Gitlab
   # groups API
   class Groups < Grape::API
     before { authenticate! }
-   
-       resource :groups do
-         # Get a groups list
-         #
-         # Example Request:
-         #  GET /groups
-         get do
-           @groups = paginate Group
-           present @groups, with: Entities::Group
 
-         end
+    resource :groups do
-         
+      # Get a groups list
-         # Create group. Available only for admin
+      #
-         #
+      # Example Request:
-         # Parameters:
+      #  GET /groups
-         #   name (required)                   - Name
+      get do
-         #   path (required)                   - Path
+        if current_user.admin
-         # Example Request:
+          @groups = paginate Group
-         #   POST /groups
+        else
-         post do
+          @groups = paginate current_user.groups
-           authenticated_as_admin!
+        end
-           attrs = attributes_for_keys [:name, :path]
+        present @groups, with: Entities::Group
-           @group = Group.new(attrs)
+      end
-           @group.owner = current_user
+
-           
+      # Create group. Available only for admin
-           if @group.save
+      #
-             present @group, with: Entities::Group
+      # Parameters:
-           else
+      #   name (required)                   - Name
-             not_found!
+      #   path (required)                   - Path
-           end
+      # Example Request:
-         end
+      #   POST /groups
-         
+      post do
-         # Get a single group, with containing projects
+        authenticated_as_admin!
-         #
+        attrs = attributes_for_keys [:name, :path]
-         # Parameters:
+        @group = Group.new(attrs)
-         #   id (required) - The ID of a group
+        @group.owner = current_user
-         # Example Request:
+
-         #   GET /groups/:id
+        if @group.save
-         get ":id" do
+          present @group, with: Entities::Group
-           @group = Group.find(params[:id])
+        else
-           present @group, with: Entities::GroupDetail
+          not_found!
-         end
+        end
-         
+      end
-       end
+
+      # Get a single group, with containing projects
+      #
+      # Parameters:
+      #   id (required) - The ID of a group
+      # Example Request:
+      #   GET /groups/:id
+      get ":id" do
+        @group = Group.find(params[:id])
+        if current_user.admin or current_user.groups.include? @group
+          present @group, with: Entities::GroupDetail
+        else
+          not_found!
+        end
+      end
+    end
   end
 end