Skip to content

Commit 7f9ea9d

Browse files
Zettat123techknowlogick
authored andcommitted
fix org membership check
1 parent 6a7c7dc commit 7f9ea9d

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

routers/api/v1/org/org.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ func ListOrgActivityFeeds(ctx *context.APIContext) {
386386
// required: true
387387
// - name: date
388388
// in: query
389-
// description: the date of the activities to be found, format is YYYY-MM-DD
389+
// description: the date of the activities to be found
390390
// type: string
391391
// format: date
392392
// - name: page
@@ -401,14 +401,21 @@ func ListOrgActivityFeeds(ctx *context.APIContext) {
401401
// "200":
402402
// "$ref": "#/responses/ActivityFeedsList"
403403

404-
org := organization.OrgFromUser(ctx.ContextUser)
405-
isMember, err := org.IsOrgMember(ctx.Doer.ID)
406-
if err != nil {
407-
ctx.Error(http.StatusInternalServerError, "IsOrgMember", err)
408-
return
404+
includePrivate := false
405+
if ctx.IsSigned {
406+
if ctx.Doer.IsAdmin {
407+
includePrivate = true
408+
} else {
409+
org := organization.OrgFromUser(ctx.ContextUser)
410+
isMember, err := org.IsOrgMember(ctx.Doer.ID)
411+
if err != nil {
412+
ctx.Error(http.StatusInternalServerError, "IsOrgMember", err)
413+
return
414+
}
415+
includePrivate = isMember
416+
}
409417
}
410418

411-
includePrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || isMember)
412419
listOptions := utils.GetListOptions(ctx)
413420

414421
opts := activities_model.GetFeedsOptions{

routers/api/v1/org/team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ func ListTeamActivityFeeds(ctx *context.APIContext) {
809809
// required: true
810810
// - name: date
811811
// in: query
812-
// description: the date of the activities to be found, format is YYYY-MM-DD
812+
// description: the date of the activities to be found
813813
// type: string
814814
// format: date
815815
// - name: page

routers/api/v1/user/user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func ListUserActivityFeeds(ctx *context.APIContext) {
155155
// parameters:
156156
// - name: username
157157
// in: path
158-
// description: username of user to get
158+
// description: username of user
159159
// type: string
160160
// required: true
161161
// - name: only-performed-by
@@ -164,7 +164,7 @@ func ListUserActivityFeeds(ctx *context.APIContext) {
164164
// type: boolean
165165
// - name: date
166166
// in: query
167-
// description: the date of the activities to be found, format is YYYY-MM-DD
167+
// description: the date of the activities to be found
168168
// type: string
169169
// format: date
170170
// - name: page

templates/swagger/v1_json.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,7 @@
14321432
{
14331433
"type": "string",
14341434
"format": "date",
1435-
"description": "the date of the activities to be found, format is YYYY-MM-DD",
1435+
"description": "the date of the activities to be found",
14361436
"name": "date",
14371437
"in": "query"
14381438
},
@@ -2927,7 +2927,7 @@
29272927
{
29282928
"type": "string",
29292929
"format": "date",
2930-
"description": "the date of the activities to be found, format is YYYY-MM-DD",
2930+
"description": "the date of the activities to be found",
29312931
"name": "date",
29322932
"in": "query"
29332933
},
@@ -12764,7 +12764,7 @@
1276412764
{
1276512765
"type": "string",
1276612766
"format": "date",
12767-
"description": "the date of the activities to be found, format is YYYY-MM-DD",
12767+
"description": "the date of the activities to be found",
1276812768
"name": "date",
1276912769
"in": "query"
1277012770
},
@@ -14460,7 +14460,7 @@
1446014460
"parameters": [
1446114461
{
1446214462
"type": "string",
14463-
"description": "username of user to get",
14463+
"description": "username of user",
1446414464
"name": "username",
1446514465
"in": "path",
1446614466
"required": true
@@ -14474,7 +14474,7 @@
1447414474
{
1447514475
"type": "string",
1447614476
"format": "date",
14477-
"description": "the date of the activities to be found, format is YYYY-MM-DD",
14477+
"description": "the date of the activities to be found",
1447814478
"name": "date",
1447914479
"in": "query"
1448014480
},

0 commit comments

Comments
 (0)