Resolve did mix up and added saving spotify refresh tokens

db/atproto.go

···
 	var authserverIss string
 	var jwkBytes string
 
-	err := db.QueryRow(`
-		SELECT id, atproto_did, atproto_pds_url, atproto_authserver_issuer, atproto_access_token, atproto_refresh_token, atproto_pds_nonce, atproto_authserver_nonce, atproto_dpop_private_jwk, atproto_token_expiry
+	err := db.QueryRow(
+		`
+		SELECT id, 
+		       atproto_did,
+		       atproto_pds_url,
+		       atproto_authserver_issuer,
+		       atproto_access_token,
+		       atproto_refresh_token,
+		       atproto_pds_nonce,
+		       atproto_authserver_nonce,
+		       atproto_dpop_private_jwk,
+		       atproto_token_expiry
 		FROM users
-		WHERE atproto_did = ? OR id`,
+		WHERE atproto_did = ?`,
 		did,
 	).Scan(
 		&oauthSession.ID,

oauth/oauth2.go

···
 	}
 
 	userId, hasSession := session.GetUserID(r.Context())
-
 	// store token and get uid
-	userID, err := o.tokenReceiver.SetAccessToken(token.AccessToken, userId, hasSession)
+	userID, err := o.tokenReceiver.SetAccessToken(token.AccessToken, token.RefreshToken, userId, hasSession)
 	if err != nil {
 		log.Printf("OAuth2 Callback Info: TokenReceiver did not return a valid user ID for token: %s...", token.AccessToken[:min(10, len(token.AccessToken))])
 	}

oauth/service.go

···
 type TokenReceiver interface {
 	// stores the access token in the db
 	// if there is a session, will associate the token with the session
-	SetAccessToken(token string, currentId int64, hasSession bool) (int64, error)
+	SetAccessToken(token string, refreshToken string, currentId int64, hasSession bool) (int64, error)
 }

service/spotify/spotify.go

···
 	return nil
 }
 
-func (s *SpotifyService) SetAccessToken(token string, userId int64, hasSession bool) (int64, error) {
-	userID, err := s.identifyAndStoreUser(token, userId, hasSession)
+func (s *SpotifyService) SetAccessToken(token string, refreshToken string, userId int64, hasSession bool) (int64, error) {
+	userID, err := s.identifyAndStoreUser(token, refreshToken, userId, hasSession)
 	if err != nil {
 		log.Printf("Error identifying and storing user: %v", err)
 		return 0, err
···
 	return userID, nil
 }
 
-func (s *SpotifyService) identifyAndStoreUser(token string, userId int64, hasSession bool) (int64, error) {
+func (s *SpotifyService) identifyAndStoreUser(token string, refreshToken string, userId int64, hasSession bool) (int64, error) {
 	userProfile, err := s.fetchSpotifyProfile(token)
 	if err != nil {
 		log.Printf("Error fetching Spotify profile: %v", err)
···
 			return 0, fmt.Errorf("user does not seem to exist")
 		} else {
 			// overwrite prev user
-			user, err = s.DB.AddSpotifySession(userId, userProfile.DisplayName, userProfile.Email, userProfile.ID, token, "", tokenExpiryTime)
+			user, err = s.DB.AddSpotifySession(userId, userProfile.DisplayName, userProfile.Email, userProfile.ID, token, refreshToken, tokenExpiryTime)
 			if err != nil {
 				log.Printf("Error adding Spotify session for user ID %d: %v", userId, err)
 				return 0, err
 			}
 		}
 	} else {
-		err = s.DB.UpdateUserToken(user.ID, token, "", tokenExpiryTime)
+		err = s.DB.UpdateUserToken(user.ID, token, refreshToken, tokenExpiryTime)
 		if err != nil {
 			// for now log and continue
 			log.Printf("Error updating user token for user ID %d: %v", user.ID, err)