chore: rollback changes to v1/authorization

Author: gwossum

v1/authorization/http_server.go

@@ -133,7 +133,6 @@ func getAuthorizedUser(r *http.Request, ts TenantService) (*influxdb.User, error
 	return ts.FindUserByID(ctx, a.GetUserID())
 }
 
-// postAuthorizationRequest encapsulates HTTP client authentication parameters.
 type postAuthorizationRequest struct {
 	Token       string                `json:"token"`
 	Status      influxdb.Status       `json:"status"`
@@ -146,7 +145,6 @@ type postAuthorizationRequest struct {
 type authResponse struct {
 	ID          platform.ID          `json:"id"`
 	Token       string               `json:"token"`
-	HashedToken string               `json:"hashedToken"`
 	Status      influxdb.Status      `json:"status"`
 	Description string               `json:"description"`
 	OrgID       platform.ID          `json:"orgID"`
@@ -176,7 +174,6 @@ func (h *AuthHandler) newAuthResponse(ctx context.Context, a *influxdb.Authoriza
 	res := &authResponse{
 		ID:          a.ID,
 		Token:       a.Token,
-		HashedToken: a.HashedToken,
 		Status:      a.Status,
 		Description: a.Description,
 		OrgID:       a.OrgID,
@@ -212,7 +209,6 @@ func (a *authResponse) toInfluxdb() *influxdb.Authorization {
 	res := &influxdb.Authorization{
 		ID:          a.ID,
 		Token:       a.Token,
-		HashedToken: a.HashedToken,
 		Status:      a.Status,
 		Description: a.Description,
 		OrgID:       a.OrgID,
@@ -249,8 +245,7 @@ func newPostAuthorizationRequest(a *influxdb.Authorization) (*postAuthorizationR
 		Description: a.Description,
 		Permissions: a.Permissions,
 		Token:       a.Token,
-		//HashedToken: a.HashedToken,
-		Status: a.Status,
+		Status:      a.Status,
 	}
 
 	if a.UserID.Valid() {

v1/authorization/http_server_test.go

@@ -304,7 +304,7 @@ func TestService_handleGetAuthorization(t *testing.T) {
 										},
 									},
 								},
-								HashedToken: "hello",
+								Token: "hello",
 							}, nil
 						}
 
@@ -461,15 +461,15 @@ func TestService_handleGetAuthorizations(t *testing.T) {
 						return []*influxdb.Authorization{
 							{
 								ID:          itesting.MustIDBase16("0d0a657820696e74"),
-								HashedToken: "hello",
+								Token:       "hello",
 								UserID:      itesting.MustIDBase16("2070616e656d2076"),
 								OrgID:       itesting.MustIDBase16("3070616e656d2076"),
 								Description: "t1",
 								Permissions: influxdb.OperPermissions(),
 							},
 							{
 								ID:          itesting.MustIDBase16("6669646573207375"),
-								HashedToken: "example",
+								Token:       "example",
 								UserID:      itesting.MustIDBase16("6c7574652c206f6e"),
 								OrgID:       itesting.MustIDBase16("9d70616e656d2076"),
 								Description: "t2",
@@ -553,15 +553,15 @@ func TestService_handleGetAuthorizations(t *testing.T) {
 						return []*influxdb.Authorization{
 							{
 								ID:          itesting.MustIDBase16("0d0a657820696e74"),
-								HashedToken: "hello",
+								Token:       "hello",
 								UserID:      itesting.MustIDBase16("2070616e656d2076"),
 								OrgID:       itesting.MustIDBase16("3070616e656d2076"),
 								Description: "t1",
 								Permissions: influxdb.OperPermissions(),
 							},
 							{
 								ID:          itesting.MustIDBase16("6669646573207375"),
-								HashedToken: "example",
+								Token:       "example",
 								UserID:      itesting.MustIDBase16("6c7574652c206f6e"),
 								OrgID:       itesting.MustIDBase16("9d70616e656d2076"),
 								Description: "t2",
@@ -629,15 +629,15 @@ func TestService_handleGetAuthorizations(t *testing.T) {
 						return []*influxdb.Authorization{
 							{
 								ID:          itesting.MustIDBase16("0d0a657820696e74"),
-								HashedToken: "hello",
+								Token:       "hello",
 								UserID:      itesting.MustIDBase16("2070616e656d2076"),
 								OrgID:       itesting.MustIDBase16("3070616e656d2076"),
 								Description: "t1",
 								Permissions: influxdb.OperPermissions(),
 							},
 							{
 								ID:          itesting.MustIDBase16("6669646573207375"),
-								HashedToken: "example",
+								Token:       "example",
 								UserID:      itesting.MustIDBase16("6c7574652c206f6e"),
 								OrgID:       itesting.MustIDBase16("9d70616e656d2076"),
 								Description: "t2",
@@ -928,7 +928,7 @@ func jsonDiffErr(s1, s2 string) (diff string, err error) {
 
 var authorizationCmpOptions = cmp.Options{
 	cmpopts.EquateEmpty(),
-	cmpopts.IgnoreFields(influxdb.Authorization{}, "ID", "Token", "HashedToken", "CreatedAt", "UpdatedAt"),
+	cmpopts.IgnoreFields(influxdb.Authorization{}, "ID", "Token", "CreatedAt", "UpdatedAt"),
 	cmp.Comparer(func(x, y []byte) bool {
 		return bytes.Equal(x, y)
 	}),

v1/authorization/storage.go

@@ -14,9 +14,8 @@ const MaxIDGenerationN = 100
 const ReservedIDs = 1000
 
 var (
-	authBucket      = []byte("legacy/authorizationsv1")
-	authIndex       = []byte("legacy/authorizationindexv1")
-	hashedAuthIndex = []byte("legacy/authorizationhashedindexv1")
+	authBucket = []byte("legacy/authorizationsv1")
+	authIndex  = []byte("legacy/authorizationindexv1")
 )
 
 type Store struct {

v1/authorization/storage_authorization.go

@@ -27,27 +27,7 @@ func authIndexBucket(tx kv.Tx) (kv.Bucket, error) {
 	return b, nil
 }
 
-func hashedAuthIndexKey(n string) []byte {
-	return []byte(n)
-}
-
-func hashedAuthIndexBucket(tx kv.Tx) (kv.Bucket, error) {
-	b, err := tx.Bucket([]byte(hashedAuthIndex))
-	if err != nil {
-		return nil, UnexpectedAuthIndexError(err)
-	}
-
-	return b, nil
-}
-
 func encodeAuthorization(a *influxdb.Authorization) ([]byte, error) {
-	if len(a.Token) > 0 && len(a.HashedToken) > 0 {
-		return nil, &errors.Error{
-			Code: errors.EInvalid,
-			Msg:  "authorization can not contained Token and HashedToken",
-		}
-	}
-
 	switch a.Status {
 	case influxdb.Active, influxdb.Inactive:
 	case "":

v1/authorization/storage_authorization_test.go

@@ -82,7 +82,6 @@ func TestAuth(t *testing.T) {
 			},
 		},
 		{
-			// VALIS: add tests for hashed tokens
 			name:  "read",
 			setup: setup,
 			results: func(t *testing.T, store *Store, tx kv.Tx) {