added logout

internal/db/discord_tokens.go

@@ -16,12 +16,13 @@ type DiscordToken struct {
 	AccessToken  string `bun:"access_token,notnull"`
 	RefreshToken string `bun:"refresh_token,notnull"`
 	ExpiresAt    int64  `bun:"expires_at,notnull"`
+	Scope        string `bun:"scope,notnull"`
+	TokenType    string `bun:"token_type,notnull"`
 }
 
-func UpdateDiscordToken(ctx context.Context, tx bun.Tx, user *User, token *discord.Token) error {
-	if user == nil {
-		return errors.New("user cannot be nil")
-	}
+// UpdateDiscordToken adds the provided discord token to the database.
+// If the user already has a token stored, it will replace that token instead.
+func (user *User) UpdateDiscordToken(ctx context.Context, tx bun.Tx, token *discord.Token) error {
 	if token == nil {
 		return errors.New("token cannot be nil")
 	}
@@ -32,6 +33,8 @@ func UpdateDiscordToken(ctx context.Context, tx bun.Tx, user *User, token *disco
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,
 		ExpiresAt:    expiresAt,
+		Scope:        token.Scope,
+		TokenType:    token.TokenType,
 	}
 
 	_, err := tx.NewInsert().
@@ -47,3 +50,46 @@ func UpdateDiscordToken(ctx context.Context, tx bun.Tx, user *User, token *disco
 	}
 	return nil
 }
+
+// DeleteDiscordTokens deletes a users discord OAuth tokens from the database.
+// It returns the DiscordToken so that it can be revoked via the discord API
+func (user *User) DeleteDiscordTokens(ctx context.Context, tx bun.Tx) (*DiscordToken, error) {
+	token, err := user.GetDiscordToken(ctx, tx)
+	if err != nil {
+		return nil, errors.Wrap(err, "user.GetDiscordToken")
+	}
+	_, err = tx.NewDelete().
+		Model((*DiscordToken)(nil)).
+		Where("discord_id = ?", user.DiscordID).
+		Exec(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "tx.NewDelete")
+	}
+	return token, nil
+}
+
+// GetDiscordToken retrieves the users discord token from the database
+func (user *User) GetDiscordToken(ctx context.Context, tx bun.Tx) (*DiscordToken, error) {
+	token := new(DiscordToken)
+	err := tx.NewSelect().
+		Model(token).
+		Where("discord_id = ?", user.DiscordID).
+		Limit(1).
+		Scan(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "tx.NewSelect")
+	}
+	return token, nil
+}
+
+// Convert reverts the token back into a *discord.Token
+func (t *DiscordToken) Convert() *discord.Token {
+	token := &discord.Token{
+		AccessToken:  t.AccessToken,
+		RefreshToken: t.RefreshToken,
+		ExpiresIn:    int(t.ExpiresAt - time.Now().Unix()),
+		Scope:        t.Scope,
+		TokenType:    t.TokenType,
+	}
+	return token
+}