Spotify improvements

db/atproto.go

···
 }
 
 func AtpSessionToAuthArgs(sess *models.ATprotoAuthSession) *oauth.XrpcAuthedRequestArgs {
-	fmt.Printf("DID: %s\nPDS URL: %s\nISS: %s\nAccess Token: %s\nNonce: %s\nPrivate JWK: %s\n", sess.DID, sess.PDSUrl, sess.AuthServerIssuer, sess.AccessToken, sess.DpopPdsNonce, sess.DpopPrivateJWK)
+	//Commenting out so jwts and tokens are not in logs
+	//fmt.Printf("DID: %s\nPDS URL: %s\nISS: %s\nAccess Token: %s\nNonce: %s\nPrivate JWK: %s\n", sess.DID, sess.PDSUrl, sess.AuthServerIssuer, sess.AccessToken, sess.DpopPdsNonce, sess.DpopPrivateJWK)
 	return &oauth.XrpcAuthedRequestArgs{
 		Did:            sess.DID,
 		PdsUrl:         sess.PDSUrl,

db/db.go

···
 	return tracks, nil
 }
 
-func (db *DB) GetUsersWithExpiredTokens() ([]*models.User, error) {
-	rows, err := db.Query(`
-    SELECT id, username, email, spotify_id, access_token, refresh_token, token_expiry, created_at, updated_at
-    FROM users
-    WHERE refresh_token IS NOT NULL AND token_expiry < ?
-    ORDER BY id`, time.Now().UTC())
-
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
+// SpotifyQueryMapping maps Spotify sql query results to user structs
+func SpotifyQueryMapping(rows *sql.Rows) ([]*models.User, error) {
 
 	var users []*models.User
 
···
 	return users, nil
 }
 
-func (db *DB) GetAllActiveUsers() ([]*models.User, error) {
+func (db *DB) GetUsersWithExpiredTokens() ([]*models.User, error) {
 	rows, err := db.Query(`
     SELECT id, username, email, spotify_id, access_token, refresh_token, token_expiry, created_at, updated_at
     FROM users
-    WHERE access_token IS NOT NULL AND token_expiry > ?
+    WHERE refresh_token IS NOT NULL AND token_expiry < ?
     ORDER BY id`, time.Now().UTC())
 
 	if err != nil {
···
 	}
 	defer rows.Close()
 
-	var users []*models.User
+	return SpotifyQueryMapping(rows)
 
-	for rows.Next() {
-		user := &models.User{}
-		err := rows.Scan(
-			&user.ID, &user.Username, &user.Email, &user.SpotifyID,
-			&user.AccessToken, &user.RefreshToken, &user.TokenExpiry,
-			&user.CreatedAt, &user.UpdatedAt)
-		if err != nil {
-			return nil, err
-		}
-		users = append(users, user)
+}
+
+func (db *DB) GetAllActiveUsers() ([]*models.User, error) {
+	rows, err := db.Query(`
+    SELECT id, username, email, spotify_id, access_token, refresh_token, token_expiry, created_at, updated_at
+    FROM users
+    WHERE access_token IS NOT NULL
+    ORDER BY id`)
+
+	if err != nil {
+		return nil, err
 	}
+	defer rows.Close()
+
+	return SpotifyQueryMapping(rows)
+}
 
-	return users, nil
+func (db *DB) GetAllActiveUsersWithUnExpiredTokens() ([]*models.User, error) {
+	rows, err := db.Query(`
+    SELECT id, username, email, spotify_id, access_token, refresh_token, token_expiry, created_at, updated_at
+    FROM users
+    WHERE access_token IS NOT NULL AND token_expiry > ?
+    ORDER BY id`, time.Now().UTC())
+
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	return SpotifyQueryMapping(rows)
 }
 
 // debug to view current user's information

service/spotify/spotify.go

···
 		if user.AccessToken != nil && user.TokenExpiry.After(time.Now().UTC()) {
 			s.userTokens[user.ID] = *user.AccessToken
 			count++
+		} else {
+			token, err := s.refreshTokenInner(user.ID)
+			if err != nil {
+				//Probably should remove the access token and refresh in long run?
+				log.Printf("Error refreshing token for user %d: %v", user.ID, err)
+				continue
+			}
+			s.userTokens[user.ID] = token
 		}
 	}
 
 	log.Printf("Loaded %d active users with valid tokens", count)
+	return nil
+}
+
+func (s *SpotifyService) UnloadAllUsers() error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.userTokens = make(map[int64]string)
 	return nil
 }
 
···
 	defer ticker.Stop()
 
 	for range ticker.C {
+		err := s.LoadAllUsers()
+		if err != nil {
+			log.Printf("Error loading spotify users: %v", err)
+			continue
+		}
 		// copy userIDs to avoid holding the lock too long
 		s.mu.RLock()
 		userIDs := make([]int64, 0, len(s.userTokens))
···
 
 				log.Printf("User %d is listening to: %s by %s", userID, track.Name, track.Artist)
 			}
+		}
+
+		//unloading users to save memory and make sure we get new signups
+		err = s.LoadAllUsers()
+		if err != nil {
+			log.Printf("Error loading spotify users: %v", err)
 		}
 	}
 }