diff --git a/auth.go b/auth.go index a537956ecc..f16d151087 100644 --- a/auth.go +++ b/auth.go @@ -9,6 +9,7 @@ type Authorization struct { ID ID `json:"id,omitempty"` Token string `json:"token"` Status Status `json:"status"` + Description string `json:"description"` User string `json:"user,omitempty"` UserID ID `json:"userID,omitempty"` Permissions []Permission `json:"permissions,omitempty"` diff --git a/bolt/onboarding.go b/bolt/onboarding.go index 8cad3f50b7..ccc8a248ea 100644 --- a/bolt/onboarding.go +++ b/bolt/onboarding.go @@ -11,6 +11,8 @@ import ( var onboardingBucket = []byte("onboardingv1") var onboardingKey = []byte("onboarding_key") +const onboardingTokenDesc = "Deftok" + var _ platform.OnboardingService = (*Client)(nil) func (c *Client) initializeOnboarding(ctx context.Context, tx *bolt.Tx) error { @@ -117,8 +119,9 @@ func (c *Client) Generate(ctx context.Context, req *platform.OnboardingRequest) return nil, err } auth := &platform.Authorization{ - User: u.Name, - UserID: u.ID, + User: u.Name, + UserID: u.ID, + Description: onboardingTokenDesc, Permissions: []platform.Permission{ platform.CreateUserPermission, platform.DeleteUserPermission, diff --git a/http/auth_test.go b/http/auth_test.go index a6d0294dbe..359fe5f852 100644 --- a/http/auth_test.go +++ b/http/auth_test.go @@ -44,14 +44,16 @@ func TestService_handleGetAuthorizations(t *testing.T) { FindAuthorizationsFn: func(ctx context.Context, filter platform.AuthorizationFilter, opts ...platform.FindOptions) ([]*platform.Authorization, int, error) { return []*platform.Authorization{ { - ID: platformtesting.MustIDBase16("0d0a657820696e74"), - Token: "hello", - UserID: platformtesting.MustIDBase16("2070616e656d2076"), + ID: platformtesting.MustIDBase16("0d0a657820696e74"), + Token: "hello", + UserID: platformtesting.MustIDBase16("2070616e656d2076"), + Description: "t1", }, { - ID: platformtesting.MustIDBase16("6669646573207375"), - Token: "example", - UserID: platformtesting.MustIDBase16("6c7574652c206f6e"), + ID: platformtesting.MustIDBase16("6669646573207375"), + Token: "example", + UserID: platformtesting.MustIDBase16("6c7574652c206f6e"), + Description: "t2", }, }, 2, nil }, @@ -75,7 +77,8 @@ func TestService_handleGetAuthorizations(t *testing.T) { "id": "0d0a657820696e74", "userID": "2070616e656d2076", "status": "", - "token": "hello" + "token": "hello", + "description": "t1" }, { "links": { @@ -85,7 +88,8 @@ func TestService_handleGetAuthorizations(t *testing.T) { "id": "6669646573207375", "userID": "6c7574652c206f6e", "status": "", - "token": "example" + "token": "example", + "description": "t2" } ] } @@ -204,7 +208,8 @@ func TestService_handleGetAuthorization(t *testing.T) { "id": "020f755c3c082000", "userID": "020f755c3c082000", "token": "hello", - "status": "" + "status": "", + "description": "" } `, }, @@ -300,9 +305,10 @@ func TestService_handlePostAuthorization(t *testing.T) { }, args: args{ authorization: &platform.Authorization{ - Token: "hello", - ID: platformtesting.MustIDBase16("020f755c3c082000"), - UserID: platformtesting.MustIDBase16("aaaaaaaaaaaaaaaa"), + Token: "hello", + ID: platformtesting.MustIDBase16("020f755c3c082000"), + UserID: platformtesting.MustIDBase16("aaaaaaaaaaaaaaaa"), + Description: "swogtok", }, }, wants: wants{ @@ -317,7 +323,8 @@ func TestService_handlePostAuthorization(t *testing.T) { "id": "020f755c3c082000", "userID": "aaaaaaaaaaaaaaaa", "token": "hello", - "status": "" + "status": "", + "description": "swogtok" } `, }, diff --git a/http/cur_swagger.yml b/http/cur_swagger.yml index 78da0fc9d2..500635f9a0 100644 --- a/http/cur_swagger.yml +++ b/http/cur_swagger.yml @@ -3533,6 +3533,9 @@ components: token: readOnly: true type: string + description: + description: user defined description of the authorization + type: string permissions: type: array items: diff --git a/inmem/onboarding.go b/inmem/onboarding.go index eb5ee5a83a..ae274b643f 100644 --- a/inmem/onboarding.go +++ b/inmem/onboarding.go @@ -8,6 +8,7 @@ import ( ) const onboardingKey = "onboarding_key" +const onboardingTokenDesc = "Deftok" var _ platform.OnboardingService = (*Service)(nil) @@ -92,8 +93,9 @@ func (s *Service) Generate(ctx context.Context, req *platform.OnboardingRequest) return nil, err } auth := &platform.Authorization{ - User: u.Name, - UserID: u.ID, + User: u.Name, + UserID: u.ID, + Description: onboardingTokenDesc, Permissions: []platform.Permission{ platform.CreateUserPermission, platform.DeleteUserPermission, diff --git a/testing/onboarding.go b/testing/onboarding.go index b6d38a147d..20be16a9a0 100644 --- a/testing/onboarding.go +++ b/testing/onboarding.go @@ -164,11 +164,12 @@ func Generate( RetentionPeriod: time.Hour * 24 * 7, }, Auth: &platform.Authorization{ - ID: MustIDBase16(fourID), - Token: oneToken, - Status: platform.Active, - User: "admin", - UserID: MustIDBase16(oneID), + ID: MustIDBase16(fourID), + Token: oneToken, + Status: platform.Active, + User: "admin", + UserID: MustIDBase16(oneID), + Description: "Deftok", Permissions: []platform.Permission{ platform.CreateUserPermission, platform.DeleteUserPermission,