[feat]: reset password/team member setting (#73)

* [feat]: reset user password

Signed-off-by: kevin <[email protected]>

* [feat]: team member setting

Signed-off-by: kevin <[email protected]>

---------

Signed-off-by: kevin <[email protected]>

Author: kevin6025

accesscontrol/policy.go

@@ -26,14 +26,10 @@ const (
 )
 
 const (
-	Org                 ResourceType = "org"
-	User                ResourceType = "user"
-	Team                ResourceType = "team"
-	Nav                 ResourceType = "nav"
-	Datasource          ResourceType = "datasource"
-	DatasourceDataQuery ResourceType = "datasource_data_query"
-	Dashboard           ResourceType = "dashboard"
-	Chart               ResourceType = "chart"
+	LinAccessResource    ResourceType = "LinAccessResource"
+	AdminAccessResource  ResourceType = "AdminAccessResource"
+	EditorAccessResource ResourceType = "EditorAccessResource"
+	ViewerAccessResource ResourceType = "ViewerAccessResource"
 )
 
 func (r ResourceType) String() string {
@@ -73,20 +69,13 @@ func (pb *PolicyBuilder) Build() []Policy {
 
 func BuildPolicyDefinitions() []Policy {
 	return NewPlicyBuilder().
-		AddPolicy(RoleLin, Org, Write).
-		AddPolicy(RoleLin, Org, Read).
-		AddPolicy(RoleAdmin, Team, Write).
-		AddPolicy(RoleAdmin, Team, Read).
-		AddPolicy(RoleAdmin, Nav, Write).
-		AddPolicy(RoleAdmin, Nav, Read).
-		AddPolicy(RoleAdmin, User, Write).
-		AddPolicy(RoleAdmin, User, Read).
-		AddPolicy(RoleAdmin, Datasource, Write).
-		AddPolicy(RoleViewer, Datasource, Read).
-		AddPolicy(RoleViewer, DatasourceDataQuery, Read).
-		AddPolicy(RoleViewer, Dashboard, Write).
-		AddPolicy(RoleViewer, Dashboard, Read).
-		AddPolicy(RoleViewer, Chart, Write).
-		AddPolicy(RoleViewer, Chart, Read).
+		AddPolicy(RoleLin, LinAccessResource, Write).
+		AddPolicy(RoleLin, LinAccessResource, Read).
+		AddPolicy(RoleAdmin, AdminAccessResource, Write).
+		AddPolicy(RoleAdmin, AdminAccessResource, Read).
+		AddPolicy(RoleEditor, EditorAccessResource, Write).
+		AddPolicy(RoleEditor, EditorAccessResource, Read).
+		AddPolicy(RoleViewer, ViewerAccessResource, Write).
+		AddPolicy(RoleViewer, ViewerAccessResource, Read).
 		Build()
 }

cmd/main.go

@@ -118,7 +118,7 @@ func buildDeps(db dbpkg.DB, cfg *config.Server) *deps.API {
 		Config:          cfg,
 		OrgSrv:          orgSrv,
 		UserSrv:         userSrv,
-		TeamSrv:         service.NewTeamService(db),
+		TeamSrv:         service.NewTeamService(db, userSrv),
 		NavSrv:          service.NewNavService(db),
 		AuthorizeSrv:    authorizeSrv,
 		AuthenticateSrv: service.NewAuthenticateService(userSrv, db),

cmd/migrator.go

@@ -72,6 +72,7 @@ func runMigration(_ *cobra.Command, _ []string) error {
 	migrator.AddMigration(dbpkg.NewMigration(&model.Dashboard{}))
 	migrator.AddMigration(dbpkg.NewMigration(&model.Chart{}))
 	migrator.AddMigration(dbpkg.NewMigration(&model.Team{}))
+	migrator.AddMigration(dbpkg.NewMigration(&model.TeamMember{}))
 	org := dbpkg.NewMigration(&model.Org{})
 	org.AddInitRecord(
 		&model.Org{Name: "Admin Org", UID: uuid.GenerateShortUUID()},

http/api/org.go

@@ -117,3 +117,14 @@ func (api *OrgAPI) GetOrgListForSignedUser(c *gin.Context) {
 	}
 	httppkg.OK(c, orgs)
 }
+
+// GetUserListForSignedOrg returns the users for current signed org, filter(user name/name/email).
+func (api *OrgAPI) GetUserListForSignedOrg(c *gin.Context) {
+	prefix := c.Query("prefix")
+	users, err := api.deps.OrgSrv.GetUserListForSignedOrg(c.Request.Context(), prefix)
+	if err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	httppkg.OK(c, users)
+}

http/api/org_test.go

@@ -373,3 +373,53 @@ func TestOrgAPI_GetOrgListForSignedUser(t *testing.T) {
 		})
 	}
 }
+
+func TestOrgAPI_GetUserListForSignedOrg(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	orgSrv := service.NewMockOrgService(ctrl)
+	r := gin.New()
+	api := NewOrgAPI(&deps.API{
+		OrgSrv: orgSrv,
+	})
+	r.GET("/org/users", api.GetUserListForSignedOrg)
+
+	cases := []struct {
+		name    string
+		prepare func()
+		assert  func(resp *httptest.ResponseRecorder)
+	}{
+		{
+			name: "get users failure",
+			prepare: func() {
+				orgSrv.EXPECT().GetUserListForSignedOrg(gomock.Any(), gomock.Any()).Return(nil, fmt.Errorf("err"))
+			},
+			assert: func(resp *httptest.ResponseRecorder) {
+				assert.Equal(t, http.StatusInternalServerError, resp.Code)
+			},
+		},
+		{
+			name: "get users successfully",
+			prepare: func() {
+				orgSrv.EXPECT().GetUserListForSignedOrg(gomock.Any(), gomock.Any()).Return(nil, nil)
+			},
+			assert: func(resp *httptest.ResponseRecorder) {
+				assert.Equal(t, http.StatusOK, resp.Code)
+			},
+		},
+	}
+	for _, tt := range cases {
+		tt := tt
+		t.Run(tt.name, func(_ *testing.T) {
+			req, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, "/org/users", http.NoBody)
+			req.Header.Set("content-type", "application/json")
+			resp := httptest.NewRecorder()
+			if tt.prepare != nil {
+				tt.prepare()
+			}
+			r.ServeHTTP(resp, req)
+			tt.assert(resp)
+		})
+	}
+}

http/api/team.go

@@ -25,6 +25,7 @@ import (
 	"github.com/lindb/linsight/constant"
 	depspkg "github.com/lindb/linsight/http/deps"
 	"github.com/lindb/linsight/model"
+	"github.com/lindb/linsight/pkg/http"
 )
 
 // TeamAPI represents team related api handlers.
@@ -109,3 +110,69 @@ func (api *TeamAPI) GetTeamByUID(c *gin.Context) {
 	}
 	httppkg.OK(c, team)
 }
+
+// GetTeamMembers returns member list for team.
+func (api *TeamAPI) GetTeamMembers(c *gin.Context) {
+	req := &model.SearchTeamMemberRequest{}
+	if err := c.ShouldBindWith(req, http.QueryJSONBind); err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	members, total, err := api.deps.TeamSrv.GetTeamMembers(c.Request.Context(), c.Param(constant.UID), req)
+	if err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	httppkg.OK(c, gin.H{
+		"total":   total,
+		"members": members,
+	})
+}
+
+// AddTeamMembers adds new members to team.
+func (api *TeamAPI) AddTeamMembers(c *gin.Context) {
+	var members model.AddTeamMember
+	if err := c.ShouldBind(&members); err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	ctx := c.Request.Context()
+	err := api.deps.TeamSrv.AddTeamMembers(ctx, c.Param(constant.UID), &members)
+	if err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	httppkg.OK(c, "Members added")
+}
+
+// UpdateTeamMember updates team member.
+func (api *TeamAPI) UpdateTeamMember(c *gin.Context) {
+	var member model.UpdateTeamMember
+	if err := c.ShouldBind(&member); err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	ctx := c.Request.Context()
+	err := api.deps.TeamSrv.UpdateTeamMember(ctx, c.Param(constant.UID), &member)
+	if err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	httppkg.OK(c, "Member updated")
+}
+
+// RemoveTeamMember removes member from team.
+func (api *TeamAPI) RemoveTeamMember(c *gin.Context) {
+	var members model.RemoveTeamMember
+	if err := c.ShouldBind(&members); err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	ctx := c.Request.Context()
+	err := api.deps.TeamSrv.RemoveTeamMember(ctx, c.Param(constant.UID), &members)
+	if err != nil {
+		httppkg.Error(c, err)
+		return
+	}
+	httppkg.OK(c, "Members removed")
+}