Clean up after Client deletion, finish cleaning up after Profile deletion.
6f473576c6ae started cleaning up after Profiles when they're deleted, but
didn't clean up the Clients created by that Profile. This fixes that, and also
fixes a BUG note about cleaning up after a Client when it's deleted.
Extend the authorizationCodeStore to have a deleteAuthorizationCodesByClientID
method that will delete the AuthorizationCodes that have been granted by the
Client specified by the passed ID. We also implemented this in memstore and
postgres, so tests continue to pass.
Extend the clientStore to have a deleteClientsByOwner method that will delete
the Clients that were created by the Profile specified by the passed ID. We also
implemented this in memstore and postgres, so tests continue to pass.
Extend the clientStore to have a removeEndpointsByClientID method that will
delete the Endpoints that belong(ed) to a the Client specified by the passed ID.
We also implemented this in memstore and postgres, so tests continue to pass.
Extend the tokenStore to have a revokeTokensByClientID method that will revoke
all the Tokens that were granted to the Client specified by the passed ID. We
also implemented this in memstore and postgres, so tests continue to pass.
When listing Clients by their owner, allow setting the num argument (which
controls how many to return) to 0 or lower, and using that to signal "return all
Clients belonging to this owner", instead of paging. This is useful when
deleting the Clients belonging to a Profile as part of the cleanup after
deleting the Profile.
Create a cleanUpAfterClientDeletion helper function that will delete the
Endpoints and AuthorizationCodes belonging to a Client, and revoke the Tokens
belonging to a Client, as part of cleaning up after a Client has been deleted.
Add a check in the handler for listing Clients owned by a Profile to disallow
the num argument to be lower than 1, because the API should be forced to page.
Call our cleanUpAfterClientDeletion once the Client has been deleted in the
appropriate handler.
Fill out our Context with new methods to wrap all the new methods we're adding
to our *Stores.
In cleanUpAfterProfileDeletion, obtain a list of clients belonging to the owner,
use our new DeleteClientsByOwner method to remove all of them, and then use the
list to run our new cleanUpAfterClientDeletion function to clear away the final
remnants of a Profile when it's deleted.
7 if os.Getenv("PG_TEST_DB") != "" {
8 p, err := NewPostgres(os.Getenv("PG_TEST_DB"))
12 scopeStores = append(scopeStores, &p)
16 var scopeStores = []scopeStore{NewMemstore()}
18 func compareScopes(scope1, scope2 Scope) (success bool, field string, val1, val2 interface{}) {
19 if scope1.ID != scope2.ID {
20 return false, "ID", scope1.ID, scope2.ID
22 if scope1.Name != scope2.Name {
23 return false, "Name", scope1.Name, scope2.Name
25 if scope1.Description != scope2.Description {
26 return false, "Description", scope1.Description, scope2.Description
28 return true, "", nil, nil
31 func TestScopeInScopeStore(t *testing.T) {
35 Description: "Access to testing data.",
40 Description: "Access to minions.",
45 Description: "Access to bananas.",
47 updatedName := "Updated Scope"
48 updatedDescription := "An updated scope."
49 update := ScopeChange{
52 update2 := ScopeChange{
53 Description: &updatedDescription,
55 update3 := ScopeChange{
57 Description: &updatedDescription,
59 for _, store := range scopeStores {
60 context := Context{scopes: store}
61 retrieved, err := context.GetScopes([]string{scope.ID})
62 if len(retrieved) != 0 {
63 t.Logf("%+v", retrieved)
64 t.Errorf("Expected %d results, got %d from %T", 0, len(retrieved), store)
66 err = context.CreateScopes([]Scope{scope})
68 t.Errorf("Error saving scope to %T: %s", store, err)
70 err = context.CreateScopes([]Scope{scope})
71 if err != ErrScopeAlreadyExists {
72 t.Errorf("Expected ErrScopeAlreadyExists, got %s instead for %T", err, store)
74 retrieved, err = context.GetScopes([]string{scope.ID})
76 t.Errorf("Unexpected error retrieving scopes from %T: %+v", store, err)
78 if len(retrieved) != 1 {
79 t.Logf("%+v", retrieved)
80 t.Errorf("Expected %d results, got %d from %T", 1, len(retrieved), store)
82 success, field, val1, val2 := compareScopes(scope, retrieved[0])
84 t.Errorf("Expected %s to be %+v, got %+v from %T", field, val1, val2, store)
86 err = context.CreateScopes([]Scope{scope2, scope3})
88 t.Errorf("Unexpected error trying to create scope2 and scope3 in %T: %+v", store, err)
90 retrieved, err = context.GetScopes([]string{scope.ID, scope2.ID, scope3.ID})
92 t.Errorf("Unexpected error retrieving scopes from %T: %+v", store, err)
94 if len(retrieved) != 3 {
95 t.Logf("%+v", retrieved)
96 t.Errorf("Expected %d results, got %d from %T", 3, len(retrieved), store)
98 for pos, s := range []Scope{scope, scope2, scope3} {
99 success, field, val1, val2 = compareScopes(s, retrieved[pos])
101 t.Errorf("Expected %s to be %+v for scope %s, got %+v from %T", field, val1, s.ID, val2, store)
104 err = context.UpdateScope(scope.ID, update)
106 t.Errorf("Unexpected error updating scope in %T: %+v", store, err)
108 scope.ApplyChange(update)
109 err = context.UpdateScope(scope2.ID, update2)
111 t.Errorf("Unexpected error updating scope in %T: %+v", store, err)
113 scope2.ApplyChange(update2)
114 err = context.UpdateScope(scope3.ID, update3)
116 t.Errorf("Unexpected error updating scope in %T: %+v", store, err)
118 scope3.ApplyChange(update3)
119 retrieved, err = context.ListScopes()
121 t.Errorf("Unexpected error retrieving scopes from %T: %+v", store, err)
123 if len(retrieved) != 3 {
124 t.Logf("%+v", retrieved)
125 t.Errorf("Expected %d results, got %d from %T", 3, len(retrieved), store)
127 for pos, s := range []Scope{scope, scope2, scope3} {
128 success, field, val1, val2 = compareScopes(s, retrieved[pos])
130 t.Errorf("Expected %s to be %+v for scope %s, got %+v from %T", field, val1, s.ID, val2, store)
133 err = context.RemoveScopes([]string{scope.ID, scope2.ID, scope3.ID})
135 t.Errorf("Unexpected error removing scopes from %T: %+v", store, err)
137 retrieved, err = context.ListScopes()
139 t.Errorf("Unexpected error retrieving scopes from %T: %+v", store, err)
141 if len(retrieved) != 0 {
142 t.Logf("%+v", retrieved)
143 t.Errorf("Expected %d results, got %d from %T", 0, len(retrieved), store)
145 err = context.RemoveScopes([]string{scope.ID})
147 t.Errorf("No error returned removing non-existent scopes from %T", store)
149 if err != ErrScopeNotFound {
150 t.Errorf("Unexpected error removing non-existent scopes from %T: %+v", store, err)
152 err = context.UpdateScope(scope.ID, update)
153 if err != ErrScopeNotFound {
154 t.Errorf("Unexpected error updating non-existent scopes from %T: %+v", store, err)