Use postgres arrays for scope associations.
Use the new pqarrays library I wrote to store Scope associations for Tokens and
AuthorizationCodes, instead of using our hacky and abstraction-breaking
many-to-many code.
We also created the authStore.deleteAuthorizationCodesByProfileID method, to
clear out the AuthorizationCodes that belong to a Profile (used when the Profile
is deleted). So we added the implementation for memstore and for our postgres
store.
Call Context.DeleteAuthorizationCodesByProfileID when deleting a Profile to
clean up after it.
Rename sortedScopes to Scopes, which we use pqarrays.StringArray's methods on to
fulfill the sql.Scanner and driver.Valuer interfaces. This lets us store Scopes
in postgres arrays.
Create a stringsToScopes helper function that creates Scope objects, with their
IDs filled by the strings specified.
Update our GrantType.Validate function signature to return Scopes instead of
[]string.
Create a Scopes.Strings() helper method that returns a []string of the IDs of
the Scopes.
Update our SQL init file to use the new postgres array definition, instead of
the many-to-many definition.
4 "code.secondbit.org/uuid.hg"
7 "github.com/secondbit/pan"
10 func (t Token) GetSQLTableName() string {
14 func (p *postgres) getTokenSQL(token string, refresh bool) *pan.Query {
16 fields, _ := pan.GetFields(t)
17 query := pan.New(pan.POSTGRES, "SELECT "+pan.QueryList(fields)+" FROM "+pan.GetTableName(t))
20 query.Include(pan.GetUnquotedColumn(t, "AccessToken")+" = ?", token)
22 query.Include(pan.GetUnquotedColumn(t, "RefreshToken")+" = ?", token)
24 return query.FlushExpressions(" ")
27 func (p *postgres) getToken(token string, refresh bool) (Token, error) {
28 query := p.getTokenSQL(token, refresh)
29 rows, err := p.db.Query(query.String(), query.Args...)
36 err := pan.Unmarshal(rows, &t)
42 if err = rows.Err(); err != nil {
46 return t, ErrTokenNotFound
51 func (p *postgres) saveTokenSQL(token Token) *pan.Query {
52 fields, values := pan.GetFields(token)
53 query := pan.New(pan.POSTGRES, "INSERT INTO "+pan.GetTableName(token))
54 query.Include("(" + pan.QueryList(fields) + ")")
55 query.Include("VALUES")
56 query.Include("("+pan.VariableList(len(values))+")", values...)
57 return query.FlushExpressions(" ")
60 func (p *postgres) saveToken(token Token) error {
61 query := p.saveTokenSQL(token)
62 _, err := p.db.Exec(query.String(), query.Args...)
63 if e, ok := err.(*pq.Error); ok && e.Constraint == "tokens_pkey" {
64 err = ErrTokenAlreadyExists
66 if err != nil || len(token.Scopes) < 1 {
72 func (p *postgres) revokeTokenSQL(token string, refresh bool) *pan.Query {
74 query := pan.New(pan.POSTGRES, "UPDATE "+pan.GetTableName(t)+" SET ")
75 query.Include(pan.GetUnquotedColumn(t, "Revoked")+" = ?", true)
78 query.Include(pan.GetUnquotedColumn(t, "AccessToken")+" = ?", token)
80 query.Include(pan.GetUnquotedColumn(t, "RefreshToken")+" = ?", token)
82 return query.FlushExpressions(" ")
85 func (p *postgres) revokeToken(token string, refresh bool) error {
86 query := p.revokeTokenSQL(token, refresh)
87 res, err := p.db.Exec(query.String(), query.Args...)
91 rows, err := res.RowsAffected()
96 return ErrTokenNotFound
101 func (p *postgres) revokeTokensByProfileIDSQL(profileID uuid.ID) *pan.Query {
103 query := pan.New(pan.POSTGRES, "UPDATE "+pan.GetTableName(t)+" SET ")
104 query.Include(pan.GetUnquotedColumn(t, "Revoked")+" = ?", true)
106 query.Include(pan.GetUnquotedColumn(t, "ProfileID")+" = ?", profileID)
107 return query.FlushExpressions(" ")
110 func (p *postgres) revokeTokensByProfileID(profileID uuid.ID) error {
111 query := p.revokeTokensByProfileIDSQL(profileID)
112 res, err := p.db.Exec(query.String(), query.Args...)
116 rows, err := res.RowsAffected()
121 return ErrProfileNotFound
126 func (p *postgres) getTokensByProfileIDSQL(profileID uuid.ID, num, offset int) *pan.Query {
128 fields, _ := pan.GetFields(token)
129 query := pan.New(pan.POSTGRES, "SELECT "+pan.QueryList(fields)+" FROM "+pan.GetTableName(token))
131 query.Include(pan.GetUnquotedColumn(token, "ProfileID")+" = ?", profileID)
132 query.IncludeLimit(int64(num))
133 query.IncludeOffset(int64(offset))
134 return query.FlushExpressions(" ")
137 func (p *postgres) getTokensByProfileID(profileID uuid.ID, num, offset int) ([]Token, error) {
138 query := p.getTokensByProfileIDSQL(profileID, num, offset)
139 rows, err := p.db.Query(query.String(), query.Args...)
141 return []Token{}, err
144 var tokenIDs []string
147 err = pan.Unmarshal(rows, &token)
151 tokens = append(tokens, token)
152 tokenIDs = append(tokenIDs, token.AccessToken)
154 if err = rows.Err(); err != nil {