Merge branch 'ldap-grafana-admin'

2018-07-18 13:02:49 +02:00
parent c63f142578 c189262bac
commit 3fa2ec0762
7 changed files with 77 additions and 24 deletions
@@ -13,14 +13,15 @@ type UserAuth struct {
 }

 type ExternalUserInfo struct {
-	AuthModule string
-	AuthId     string
-	UserId     int64
-	Email      string
-	Login      string
-	Name       string
-	Groups     []string
-	OrgRoles   map[int64]RoleType
+	AuthModule     string
+	AuthId         string
+	UserId         int64
+	Email          string
+	Login          string
+	Name           string
+	Groups         []string
+	OrgRoles       map[int64]RoleType
+	IsGrafanaAdmin *bool // This is a pointer to know if we should sync this or not (nil = ignore sync)
 }

 // ---------------------