Implement postgres version of scopeStore.
Update the authd server to use postgres as its scopeStore, instead of memstore.
panic when starting the authd server if the CreateScopes call fails. This
should, ideally, ignore ErrScopeAlreadyExists errors, but does not as of this
commit.
Update the simple.gotmpl template to properly display scopes, after switching to
the Scope type instead of simply passing around the string the client supplied
broke the template and I never bothered fixing it.
Update the updateScopes method on the scopeStore (and the corresponding
UpdateScopes method on the Context type) to be updateScope/UpdateScope.
Operating on several scopes at a time like that is simply too challenging in
SQL and I can't justify the complexity with a use case.
Add a helper method to ScopeChange called Empty(), which returns true if the
ScopeChange is full of nil values.
Remove the ID from the ScopeChange type, because we're no longer accepting
multiple ScopeChange types in UpdateScope, so we can supply that information
outside the ScopeChange, which matches the rest of our update* methods.
Correct our tests in scope_test.go to correctly use the updateScope method
instead of the old updateScopes method. This generally just resulted in calling
updateScope multiple times, as opposed to just once.
Add a scope table initialization to the sql/postgres_init.sql script.
7 "code.secondbit.org/uuid.hg"
10 var tokenStores = []tokenStore{NewMemstore()}
12 func compareTokens(token1, token2 Token) (success bool, field string, val1, val2 interface{}) {
13 if token1.AccessToken != token2.AccessToken {
14 return false, "access token", token1.AccessToken, token2.AccessToken
16 if token1.RefreshToken != token2.RefreshToken {
17 return false, "refresh token", token1.RefreshToken, token2.RefreshToken
19 if !token1.Created.Equal(token2.Created) {
20 return false, "created", token1.Created, token2.Created
22 if token1.CreatedFrom != token2.CreatedFrom {
23 return false, "created from", token1.CreatedFrom, token2.CreatedFrom
25 if token1.ExpiresIn != token2.ExpiresIn {
26 return false, "expires in", token1.ExpiresIn, token2.ExpiresIn
28 if token1.TokenType != token2.TokenType {
29 return false, "token type", token1.TokenType, token2.TokenType
31 if len(token1.Scopes) != len(token2.Scopes) {
32 return false, "scopes", token1.Scopes, token2.Scopes
34 for pos, scope := range token1.Scopes {
35 if scope != token2.Scopes[pos] {
36 return false, "scopes", token1.Scopes, token2.Scopes
39 if !token1.ProfileID.Equal(token2.ProfileID) {
40 return false, "profile ID", token1.ProfileID, token2.ProfileID
42 if token1.Revoked != token2.Revoked {
43 return false, "revoked", token1.Revoked, token2.Revoked
45 return true, "", nil, nil
48 func TestTokenStoreSuccess(t *testing.T) {
51 AccessToken: "access",
52 RefreshToken: "refresh",
53 Created: time.Now().Round(time.Millisecond),
56 Scopes: []string{"scope"},
57 ProfileID: uuid.NewID(),
59 for _, store := range tokenStores {
60 context := Context{tokens: store}
61 retrievedAccess, err := context.GetToken(token.AccessToken, false)
63 t.Errorf("Expected ErrTokenNotFound from %T, got %+v", store, retrievedAccess)
64 } else if err != ErrTokenNotFound {
65 t.Errorf("Expected ErrTokenNotFound from %T, got %s", store, err)
67 retrievedRefresh, err := context.GetToken(token.RefreshToken, true)
69 t.Errorf("Expected ErrTokenNotFound from %T, got %+v", store, retrievedRefresh)
70 } else if err != ErrTokenNotFound {
71 t.Errorf("Expected ErrTokenNotFound from %T, got %s", store, err)
73 err = context.RevokeToken(token.AccessToken, false)
74 if err != ErrTokenNotFound {
75 t.Errorf("Expected ErrTokenNotFound from %T, got %s", store, err)
77 err = context.RevokeToken(token.RefreshToken, true)
78 if err != ErrTokenNotFound {
79 t.Errorf("Expected ErrTokenNotFound from %T, got %s", store, err)
81 err = context.SaveToken(token)
83 t.Errorf("Error saving token to %T: %s", store, err)
85 err = context.SaveToken(token)
86 if err != ErrTokenAlreadyExists {
87 t.Errorf("Expected ErrTokenAlreadyExists from %T, got %s", store, err)
89 retrievedAccess, err = context.GetToken(token.AccessToken, false)
91 t.Errorf("Error retrieving token from %T: %s", store, err)
93 success, field, expectation, result := compareTokens(token, retrievedAccess)
95 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
97 retrievedRefresh, err = context.GetToken(token.RefreshToken, true)
99 t.Errorf("Error retrieving refresh token from %T: %s", store, err)
101 success, field, expectation, result = compareTokens(token, retrievedRefresh)
103 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
105 retrievedProfile, err := context.GetTokensByProfileID(token.ProfileID, 25, 0)
107 t.Errorf("Error retrieving token by profile from %T: %s", store, err)
109 if len(retrievedProfile) != 1 {
110 t.Errorf("Expected 1 token retrieved by profile ID from %T, got %+v", store, retrievedProfile)
112 success, field, expectation, result = compareTokens(token, retrievedProfile[0])
114 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
116 err = context.RevokeToken(token.AccessToken, false)
118 t.Errorf("Error revoking token in %T: %s", store, err)
120 retrievedRevoked, err := context.GetToken(token.AccessToken, false)
122 t.Errorf("Error retrieving token from %T: %s", store, err)
125 success, field, expectation, result = compareTokens(token, retrievedRevoked)
127 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
129 err = context.RevokeToken(token.RefreshToken, true)
131 t.Errorf("Error revoking token in %T: %s", store, err)
133 retrievedRevoked, err = context.GetToken(token.RefreshToken, true)
135 t.Errorf("Error retrieving token from %T: %s", store, err)
137 token.RefreshRevoked = true
138 success, field, expectation, result = compareTokens(token, retrievedRevoked)
140 t.Errorf("Expected field %s to be %v, but got %v from %T", field, expectation, result, store)
145 // BUG(paddy): We need to test the refreshTokenValidate function.
146 // BUG(paddy): We need to test the refreshTokenInvalidate function.