Skip to content

Commit 700aff5

Browse files
committed
Remove access_token use from database population endpoints
1 parent ec40dd0 commit 700aff5

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

backend/src/controllers/database.py

+12-18
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ def database_controller(
3030

3131
@database_controller.route("populate_user", methods=["GET"])
3232
def populate_user():
33-
access_token = request.cookies.get("spotify_access_token")
34-
user = spotify.get_user_by_id(access_token)
33+
user_id = request.cookies.get("user_id")
34+
user = spotify.get_user_by_id(user_id=user_id)
3535
(db_user, _) = get_or_create_user(user)
36-
simplified_playlists = spotify.get_all_playlists(
37-
user_id=user.id, access_token=access_token
38-
)
36+
simplified_playlists = spotify.get_all_playlists(user_id=user.id)
3937

4038
for simplified_playlist in simplified_playlists:
4139
with database.database.atomic():
@@ -50,7 +48,6 @@ def populate_user():
5048
delete_playlist(db_playlist.id)
5149
playlist = spotify.get_playlist(
5250
user_id=user.id,
53-
access_token=access_token,
5451
id=simplified_playlist.id,
5552
)
5653
create_playlist(playlist, db_user)
@@ -59,21 +56,19 @@ def populate_user():
5956

6057
@database_controller.route("populate_playlist/<id>", methods=["GET"])
6158
def populate_playlist(id):
62-
access_token = request.cookies.get("spotify_access_token")
63-
user = spotify.get_user_by_id(access_token)
59+
user_id = request.cookies.get("user_id")
60+
user = spotify.get_user_by_id(user_id=user_id)
6461
(db_user, _) = get_or_create_user(user)
6562
db_playlist = get_playlist_by_id_or_none(id)
6663
if db_playlist is not None:
6764
delete_playlist(db_playlist.id)
68-
playlist = spotify.get_playlist(
69-
user_id=user.id, access_token=access_token, id=id
70-
)
65+
playlist = spotify.get_playlist(user_id=user.id, id=id)
7166
create_playlist(playlist, db_user)
7267
albums = get_playlist_albums(playlist.id)
7368
batch_albums = split_list(albums, 20)
7469
for album_chunk in batch_albums:
7570
albums = spotify.get_multiple_albums(
76-
access_token=access_token, ids=[album.id for album in album_chunk]
71+
user_id=user_id, ids=[album.id for album in album_chunk]
7772
)
7873
for db_album in albums:
7974
with database.database.atomic():
@@ -86,13 +81,12 @@ def populate_playlist(id):
8681

8782
@database_controller.route("populate_additional_album_details", methods=["GET"])
8883
def populate_additional_album_details():
89-
access_token = request.cookies.get("spotify_access_token")
90-
user = spotify.get_user_by_id(access_token)
91-
albums = get_user_albums_with_no_artists(user.id)
84+
user_id = request.cookies.get("user_id")
85+
albums = get_user_albums_with_no_artists(user_id=user_id)
9286
batch_albums = split_list(albums, 20)
9387
for album_chunk in batch_albums:
9488
albums = spotify.get_multiple_albums(
95-
access_token=access_token, ids=[album.id for album in album_chunk]
89+
user_id=user_id, ids=[album.id for album in album_chunk]
9690
)
9791
for db_album in albums:
9892
with database.database.atomic():
@@ -111,8 +105,8 @@ def populate_universal_genre_list():
111105

112106
@database_controller.route("populate_user_album_genres", methods=["GET"])
113107
def populate_user_album_genres():
114-
access_token = request.cookies.get("spotify_access_token")
115-
user = spotify.get_user_by_id(access_token)
108+
user_id = request.cookies.get("user_id")
109+
user = spotify.get_user_by_id(user_id=user_id)
116110
populate_album_genres_by_user_id(user.id, musicbrainz)
117111
return make_response("User album genres populated", 201)
118112

0 commit comments

Comments
 (0)