mirror of
				https://gitcode.com/gitea/gitea.git
				synced 2025-10-31 16:38:10 +08:00 
			
		
		
		
	 1751d5fcf2
			
		
	
	1751d5fcf2
	
	
	
		
			
			* Restricted users (#4334): initial implementation * Add User.IsRestricted & UI to edit it * Pass user object instead of user id to places where IsRestricted flag matters * Restricted users: maintain access rows for all referenced repos (incl public) * Take logged in user & IsRestricted flag into account in org/repo listings, searches and accesses * Add basic repo access tests for restricted users Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Mention restricted users in the faq Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Revert unnecessary change `.isUserPartOfOrg` -> `.IsUserPartOfOrg` Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Remove unnecessary `org.IsOrganization()` call Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Revert to an `int64` keyed `accessMap` * Add type `userAccess` * Add convenience func updateUserAccess() * Turn accessMap into a `map[int64]userAccess` Signed-off-by: Manush Dodunekov <manush@stendahls.se> * or even better: `map[int64]*userAccess` * updateUserAccess(): use tighter syntax as suggested by lafriks * even tighter * Avoid extra loop * Don't disclose limited orgs to unauthenticated users * Don't assume block only applies to orgs * Use an array of `VisibleType` for filtering * fix yet another thinko * Ok - no need for u * Revert "Ok - no need for u" This reverts commit 5c3e886aabd5acd997a3b35687d322439732c200. Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Lauris BH <lauris@nix.lv>
		
			
				
	
	
		
			53 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			53 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2018 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.package models
 | |
| 
 | |
| package models
 | |
| 
 | |
| import (
 | |
| 	"encoding/json"
 | |
| 	"testing"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func TestGetUserHeatmapDataByUser(t *testing.T) {
 | |
| 	testCases := []struct {
 | |
| 		userID      int64
 | |
| 		CountResult int
 | |
| 		JSONResult  string
 | |
| 	}{
 | |
| 		{2, 1, `[{"timestamp":1571616000,"contributions":1}]`},
 | |
| 		{3, 0, `[]`},
 | |
| 	}
 | |
| 	// Prepare
 | |
| 	assert.NoError(t, PrepareTestDatabase())
 | |
| 
 | |
| 	for _, tc := range testCases {
 | |
| 
 | |
| 		// Insert some action
 | |
| 		user := AssertExistsAndLoadBean(t, &User{ID: tc.userID}).(*User)
 | |
| 
 | |
| 		// get the action for comparison
 | |
| 		actions, err := GetFeeds(GetFeedsOptions{
 | |
| 			RequestedUser:   user,
 | |
| 			Actor:           user,
 | |
| 			IncludePrivate:  true,
 | |
| 			OnlyPerformedBy: false,
 | |
| 			IncludeDeleted:  true,
 | |
| 		})
 | |
| 		assert.NoError(t, err)
 | |
| 
 | |
| 		// Get the heatmap and compare
 | |
| 		heatmap, err := GetUserHeatmapDataByUser(user)
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.Equal(t, len(actions), len(heatmap), "invalid action count: did the test data became too old?")
 | |
| 		assert.Equal(t, tc.CountResult, len(heatmap))
 | |
| 
 | |
| 		//Test JSON rendering
 | |
| 		jsonData, err := json.Marshal(heatmap)
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.Equal(t, tc.JSONResult, string(jsonData))
 | |
| 	}
 | |
| }
 |