Big refactoring for context.User, and how current user info is fetching, now included collaborator role

2015-01-16 14:32:18 +01:00
parent 52992928d5
commit 22156fe309
17 changed files with 168 additions and 104 deletions
@@ -85,14 +85,29 @@ type SearchAccountsQuery struct {
 	Result []*AccountSearchHitDTO
 }

+type GetSignedInUserQuery struct {
+	AccountId int64
+	Result    *SignInUser
+}
+
 // ------------------------
 // DTO & Projections
+type SignInUser struct {
+	AccountId        int64
+	UsingAccountId   int64
+	UsingAccountName string
+	UserRole         RoleType
+	UserLogin        string
+	UserName         string
+	UserEmail        string
+	IsGrafanaAdmin   bool
+}

 type OtherAccountDTO struct {
-	AccountId int64  `json:"accountId"`
-	Email     string `json:"email"`
-	Role      string `json:"role"`
-	IsUsing   bool   `json:"isUsing"`
+	AccountId int64    `json:"accountId"`
+	Email     string   `json:"email"`
+	Role      RoleType `json:"role"`
+	IsUsing   bool     `json:"isUsing"`
 }

 type AccountSearchHitDTO struct {