Re-ordered structs to put locale last

dexidp · Aug 28, 2019 · 78ef63d · 78ef63d
1 parent becb3d2
commit 78ef63d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/connector/connector.go b/connector/connector.go
@@ -27,8 +27,8 @@ type Identity struct {
 	Username      string
 	Email         string
 	EmailVerified bool
-	Locale        string
 	Groups        []string
+	Locale        string
 
 	// ConnectorData holds data used by the connector for subsequent requests after initial
 	// authentication, such as access tokens for upstream provides.

diff --git a/server/oauth2.go b/server/oauth2.go
@@ -255,8 +255,8 @@ type idTokenClaims struct {
 
 	Email         string   `json:"email,omitempty"`
 	EmailVerified *bool    `json:"email_verified,omitempty"`
-	Locale        string   `json:"locale,omitempty"`
 	Groups        []string `json:"groups,omitempty"`
+	Locale        string   `json:"locale,omitempty"`
 
 	Name string `json:"name,omitempty"`
 

diff --git a/storage/conformance/conformance.go b/storage/conformance/conformance.go
@@ -97,8 +97,8 @@ func testAuthRequestCRUD(t *testing.T, s storage.Storage) {
 			Username:      "jane",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a", "b"},
+			Locale:        "en_US",
 		},
 	}
 
@@ -130,8 +130,8 @@ func testAuthRequestCRUD(t *testing.T, s storage.Storage) {
 			Username:      "john",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a"},
+			Locale:        "en_US",
 		},
 	}
 
@@ -180,8 +180,8 @@ func testAuthCodeCRUD(t *testing.T, s storage.Storage) {
 			Username:      "jane",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a", "b"},
+			Locale:        "en_US",
 		},
 	}
 
@@ -203,8 +203,8 @@ func testAuthCodeCRUD(t *testing.T, s storage.Storage) {
 			Username:      "john",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a"},
+			Locale:        "en_US",
 		},
 	}
 
@@ -325,8 +325,8 @@ func testRefreshTokenCRUD(t *testing.T, s storage.Storage) {
 			Username:      "jane",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a", "b"},
+			Locale:        "en_US",
 		},
 		ConnectorData: []byte(`{"some":"data"}`),
 	}
@@ -380,8 +380,8 @@ func testRefreshTokenCRUD(t *testing.T, s storage.Storage) {
 			Username:      "john",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a", "b"},
+			Locale:        "en_US",
 		},
 		ConnectorData: []byte(`{"some":"data"}`),
 	}
@@ -800,8 +800,8 @@ func testGC(t *testing.T, s storage.Storage) {
 			Username:      "jane",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a", "b"},
+			Locale:        "en_US",
 		},
 	}
 
@@ -861,8 +861,8 @@ func testTimezones(t *testing.T, s storage.Storage) {
 			Username:      "jane",
 			Email:         "[email protected]",
 			EmailVerified: true,
-			Locale:        "en_US",
 			Groups:        []string{"a", "b"},
+			Locale:        "en_US",
 		},
 	}
 	if err := s.CreateAuthCode(c); err != nil {

diff --git a/storage/etcd/types.go b/storage/etcd/types.go
@@ -152,8 +152,8 @@ type Claims struct {
 	Username      string   `json:"username"`
 	Email         string   `json:"email"`
 	EmailVerified bool     `json:"emailVerified"`
-	Locale        string   `json:"locale,omitempty"`
 	Groups        []string `json:"groups,omitempty"`
+	Locale        string   `json:"locale,omitempty"`
 }
 
 func fromStorageClaims(i storage.Claims) Claims {
@@ -162,8 +162,8 @@ func fromStorageClaims(i storage.Claims) Claims {
 		Username:      i.Username,
 		Email:         i.Email,
 		EmailVerified: i.EmailVerified,
-		Locale:        i.Locale,
 		Groups:        i.Groups,
+		Locale:        i.Locale,
 	}
 }
 
@@ -173,8 +173,8 @@ func toStorageClaims(i Claims) storage.Claims {
 		Username:      i.Username,
 		Email:         i.Email,
 		EmailVerified: i.EmailVerified,
-		Locale:        i.Locale,
 		Groups:        i.Groups,
+		Locale:        i.Locale,
 	}
 }
 

diff --git a/storage/kubernetes/types.go b/storage/kubernetes/types.go
@@ -214,8 +214,8 @@ type Claims struct {
 	Username      string   `json:"username"`
 	Email         string   `json:"email"`
 	EmailVerified bool     `json:"emailVerified"`
-	Locale        string   `json:"locale,omitempty"`
 	Groups        []string `json:"groups,omitempty"`
+	Locale        string   `json:"locale,omitempty"`
 }
 
 func fromStorageClaims(i storage.Claims) Claims {
@@ -224,8 +224,8 @@ func fromStorageClaims(i storage.Claims) Claims {
 		Username:      i.Username,
 		Email:         i.Email,
 		EmailVerified: i.EmailVerified,
-		Locale:        i.Locale,
 		Groups:        i.Groups,
+		Locale:        i.Locale,
 	}
 }
 
@@ -235,8 +235,8 @@ func toStorageClaims(i Claims) storage.Claims {
 		Username:      i.Username,
 		Email:         i.Email,
 		EmailVerified: i.EmailVerified,
-		Locale:        i.Locale,
 		Groups:        i.Groups,
+		Locale:        i.Locale,
 	}
 }
 

diff --git a/storage/storage.go b/storage/storage.go
@@ -141,8 +141,8 @@ type Claims struct {
 	Username      string
 	Email         string
 	EmailVerified bool
-	Locale        string
 	Groups        []string
+	Locale        string
 }
 
 // AuthRequest represents a OAuth2 client authorization request. It holds the state