Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
06147286
Commit
06147286
authored
Aug 22, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group and project search for anonymous users
parent
502d6464
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
95 additions
and
15 deletions
+95
-15
app/assets/javascripts/api.js
app/assets/javascripts/api.js
+10
-5
app/views/search/_form.html.haml
app/views/search/_form.html.haml
+1
-1
changelogs/unreleased/31409-fix-group-and-project-search-for-anonymous-users.yml
...1409-fix-group-and-project-search-for-anonymous-users.yml
+5
-0
doc/api/groups.md
doc/api/groups.md
+6
-3
spec/features/search_spec.rb
spec/features/search_spec.rb
+26
-0
spec/javascripts/api_spec.js
spec/javascripts/api_spec.js
+24
-2
spec/javascripts/project_title_spec.js
spec/javascripts/project_title_spec.js
+4
-2
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+19
-2
No files found.
app/assets/javascripts/api.js
View file @
06147286
...
@@ -55,13 +55,18 @@ const Api = {
...
@@ -55,13 +55,18 @@ const Api = {
// Return projects list. Filtered by query
// Return projects list. Filtered by query
projects
(
query
,
options
,
callback
)
{
projects
(
query
,
options
,
callback
)
{
const
url
=
Api
.
buildUrl
(
Api
.
projectsPath
);
const
url
=
Api
.
buildUrl
(
Api
.
projectsPath
);
const
defaults
=
{
search
:
query
,
per_page
:
20
,
};
if
(
gon
.
current_user_id
)
{
defaults
.
membership
=
true
;
}
return
$
.
ajax
({
return
$
.
ajax
({
url
,
url
,
data
:
Object
.
assign
({
data
:
Object
.
assign
(
defaults
,
options
),
search
:
query
,
per_page
:
20
,
membership
:
true
,
},
options
),
dataType
:
'
json
'
,
dataType
:
'
json
'
,
})
})
.
done
(
projects
=>
callback
(
projects
));
.
done
(
projects
=>
callback
(
projects
));
...
...
app/views/search/_form.html.haml
View file @
06147286
...
@@ -11,5 +11,5 @@
...
@@ -11,5 +11,5 @@
%span
.sr-only
%span
.sr-only
Clear search
Clear search
-
unless
params
[
:snippets
].
eql?
'true'
-
unless
params
[
:snippets
].
eql?
'true'
=
render
'filter'
if
current_user
=
render
'filter'
=
button_tag
"Search"
,
class:
"btn btn-success btn-search"
=
button_tag
"Search"
,
class:
"btn btn-success btn-search"
changelogs/unreleased/31409-fix-group-and-project-search-for-anonymous-users.yml
0 → 100644
View file @
06147286
---
title
:
Fix group and project search for anonymous users
merge_request
:
13745
author
:
type
:
fixed
doc/api/groups.md
View file @
06147286
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
## List groups
## List groups
Get a list of groups. (As user: my groups or all available, as admin: all groups).
Get a list of visible groups for the authenticated user. When accessed without
authentication, only public groups are returned.
Parameters:
Parameters:
...
@@ -43,7 +44,8 @@ You can search for groups by name or path, see below.
...
@@ -43,7 +44,8 @@ You can search for groups by name or path, see below.
## List a group's projects
## List a group's projects
Get a list of projects in this group.
Get a list of projects in this group. When accessed without authentication, only
public projects are returned.
```
```
GET /groups/:id/projects
GET /groups/:id/projects
...
@@ -109,7 +111,8 @@ Example response:
...
@@ -109,7 +111,8 @@ Example response:
## Details of a group
## Details of a group
Get all details of a group.
Get all details of a group. This endpoint can be accessed without authentication
if the group is publicly accessible.
```
```
GET /groups/:id
GET /groups/:id
...
...
spec/features/search_spec.rb
View file @
06147286
...
@@ -281,4 +281,30 @@ describe "Search" do
...
@@ -281,4 +281,30 @@ describe "Search" do
expect
(
page
).
to
have_selector
(
'.commit-row-description'
,
count:
9
)
expect
(
page
).
to
have_selector
(
'.commit-row-description'
,
count:
9
)
end
end
end
end
context
'anonymous user'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
before
do
sign_out
(
user
)
end
it
'preserves the group being searched in'
do
visit
search_path
(
group_id:
project
.
namespace
.
id
)
fill_in
'search'
,
with:
'foo'
click_button
'Search'
expect
(
find
(
'#group_id'
).
value
).
to
eq
(
project
.
namespace
.
id
.
to_s
)
end
it
'preserves the project being searched in'
do
visit
search_path
(
project_id:
project
.
id
)
fill_in
'search'
,
with:
'foo'
click_button
'Search'
expect
(
find
(
'#project_id'
).
value
).
to
eq
(
project
.
id
.
to_s
)
end
end
end
end
spec/javascripts/api_spec.js
View file @
06147286
...
@@ -17,7 +17,7 @@ describe('Api', () => {
...
@@ -17,7 +17,7 @@ describe('Api', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
originalGon
=
window
.
gon
;
originalGon
=
window
.
gon
;
window
.
gon
=
dummyGon
;
window
.
gon
=
Object
.
assign
({},
dummyGon
)
;
});
});
afterEach
(()
=>
{
afterEach
(()
=>
{
...
@@ -98,10 +98,11 @@ describe('Api', () => {
...
@@ -98,10 +98,11 @@ describe('Api', () => {
});
});
describe
(
'
projects
'
,
()
=>
{
describe
(
'
projects
'
,
()
=>
{
it
(
'
fetches projects
'
,
(
done
)
=>
{
it
(
'
fetches projects
with membership when logged in
'
,
(
done
)
=>
{
const
query
=
'
dummy query
'
;
const
query
=
'
dummy query
'
;
const
options
=
{
unused
:
'
option
'
};
const
options
=
{
unused
:
'
option
'
};
const
expectedUrl
=
`
${
dummyUrlRoot
}
/api/
${
dummyApiVersion
}
/projects.json?simple=true`
;
const
expectedUrl
=
`
${
dummyUrlRoot
}
/api/
${
dummyApiVersion
}
/projects.json?simple=true`
;
window
.
gon
.
current_user_id
=
1
;
const
expectedData
=
Object
.
assign
({
const
expectedData
=
Object
.
assign
({
search
:
query
,
search
:
query
,
per_page
:
20
,
per_page
:
20
,
...
@@ -119,6 +120,27 @@ describe('Api', () => {
...
@@ -119,6 +120,27 @@ describe('Api', () => {
done
();
done
();
});
});
});
});
it
(
'
fetches projects without membership when not logged in
'
,
(
done
)
=>
{
const
query
=
'
dummy query
'
;
const
options
=
{
unused
:
'
option
'
};
const
expectedUrl
=
`
${
dummyUrlRoot
}
/api/
${
dummyApiVersion
}
/projects.json?simple=true`
;
const
expectedData
=
Object
.
assign
({
search
:
query
,
per_page
:
20
,
},
options
);
spyOn
(
jQuery
,
'
ajax
'
).
and
.
callFake
((
request
)
=>
{
expect
(
request
.
url
).
toEqual
(
expectedUrl
);
expect
(
request
.
dataType
).
toEqual
(
'
json
'
);
expect
(
request
.
data
).
toEqual
(
expectedData
);
return
sendDummyResponse
();
});
Api
.
projects
(
query
,
options
,
(
response
)
=>
{
expect
(
response
).
toBe
(
dummyResponse
);
done
();
});
});
});
});
describe
(
'
newLabel
'
,
()
=>
{
describe
(
'
newLabel
'
,
()
=>
{
...
...
spec/javascripts/project_title_spec.js
View file @
06147286
...
@@ -7,6 +7,7 @@ import '~/project_select';
...
@@ -7,6 +7,7 @@ import '~/project_select';
import
'
~/project
'
;
import
'
~/project
'
;
describe
(
'
Project Title
'
,
()
=>
{
describe
(
'
Project Title
'
,
()
=>
{
const
dummyApiVersion
=
'
v3000
'
;
preloadFixtures
(
'
issues/open-issue.html.raw
'
);
preloadFixtures
(
'
issues/open-issue.html.raw
'
);
loadJSONFixtures
(
'
projects.json
'
);
loadJSONFixtures
(
'
projects.json
'
);
...
@@ -14,7 +15,7 @@ describe('Project Title', () => {
...
@@ -14,7 +15,7 @@ describe('Project Title', () => {
loadFixtures
(
'
issues/open-issue.html.raw
'
);
loadFixtures
(
'
issues/open-issue.html.raw
'
);
window
.
gon
=
{};
window
.
gon
=
{};
window
.
gon
.
api_version
=
'
v3
'
;
window
.
gon
.
api_version
=
dummyApiVersion
;
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
Project
();
new
Project
();
...
@@ -37,9 +38,10 @@ describe('Project Title', () => {
...
@@ -37,9 +38,10 @@ describe('Project Title', () => {
it
(
'
toggles dropdown
'
,
()
=>
{
it
(
'
toggles dropdown
'
,
()
=>
{
const
$menu
=
$
(
'
.js-dropdown-menu-projects
'
);
const
$menu
=
$
(
'
.js-dropdown-menu-projects
'
);
window
.
gon
.
current_user_id
=
1
;
$
(
'
.js-projects-dropdown-toggle
'
).
click
();
$
(
'
.js-projects-dropdown-toggle
'
).
click
();
expect
(
$menu
).
toHaveClass
(
'
open
'
);
expect
(
$menu
).
toHaveClass
(
'
open
'
);
expect
(
reqUrl
).
toBe
(
'
/api/v3/projects.json?simple=true
'
);
expect
(
reqUrl
).
toBe
(
`/api/
${
dummyApiVersion
}
/projects.json?simple=true`
);
expect
(
reqData
).
toEqual
({
expect
(
reqData
).
toEqual
({
search
:
''
,
search
:
''
,
order_by
:
'
last_activity_at
'
,
order_by
:
'
last_activity_at
'
,
...
...
spec/requests/api/groups_spec.rb
View file @
06147286
...
@@ -20,10 +20,15 @@ describe API::Groups do
...
@@ -20,10 +20,15 @@ describe API::Groups do
describe
"GET /groups"
do
describe
"GET /groups"
do
context
"when unauthenticated"
do
context
"when unauthenticated"
do
it
"returns
authentication error
"
do
it
"returns
public groups
"
do
get
api
(
"/groups"
)
get
api
(
"/groups"
)
expect
(
response
).
to
have_http_status
(
401
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
Array
expect
(
json_response
.
length
).
to
eq
(
1
)
expect
(
json_response
)
.
to
satisfy_one
{
|
group
|
group
[
'name'
]
==
group1
.
name
}
end
end
end
end
...
@@ -165,6 +170,18 @@ describe API::Groups do
...
@@ -165,6 +170,18 @@ describe API::Groups do
end
end
describe
"GET /groups/:id"
do
describe
"GET /groups/:id"
do
context
'when unauthenticated'
do
it
'returns 404 for a private group'
do
get
api
(
"/groups/
#{
group2
.
id
}
"
)
expect
(
response
).
to
have_http_status
(
404
)
end
it
'returns 200 for a public group'
do
get
api
(
"/groups/
#{
group1
.
id
}
"
)
expect
(
response
).
to
have_http_status
(
200
)
end
end
context
"when authenticated as user"
do
context
"when authenticated as user"
do
it
"returns one of user1's groups"
do
it
"returns one of user1's groups"
do
project
=
create
(
:project
,
namespace:
group2
,
path:
'Foo'
)
project
=
create
(
:project
,
namespace:
group2
,
path:
'Foo'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment