mirror of
https://github.com/navidrome/navidrome.git
synced 2026-04-03 06:41:01 +00:00
a50af42872
* [bugfix] player: use userId, other fixes This PR primarily resolves #1928 by switching the foreign key of `player` from `user.user_name` to `user.id`. There are also a few other fixes/changes: - For some bizarre reason, `ip_address` is never returned from `read`/`get`. Change the field to `ip`, which works. Somehow - Update `players_test.go` mock to also check for user agent, replicating the actual code - Update `player_repository.go` `isPermitted` to check user id. I don't know how this worked before... - tests! - a few places referred to `typ`, when it is really `userAgent`. Change the field names * baseRequest -> selectPlayer * remove comment * update migration, make all of persistence foreign key enabled * maybe don't forget to save the file first
63 lines
1.5 KiB
Go
63 lines
1.5 KiB
Go
package migrations
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/pressly/goose/v3"
|
|
)
|
|
|
|
func init() {
|
|
goose.AddMigrationContext(upPlayerUseUserIdOverUsername, downPlayerUseUserIdOverUsername)
|
|
}
|
|
|
|
func upPlayerUseUserIdOverUsername(ctx context.Context, tx *sql.Tx) error {
|
|
_, err := tx.ExecContext(ctx, `
|
|
CREATE TABLE player_dg_tmp
|
|
(
|
|
id varchar(255) not null
|
|
primary key,
|
|
name varchar not null,
|
|
user_agent varchar,
|
|
user_id varchar not null
|
|
references user (id)
|
|
on update cascade on delete cascade,
|
|
client varchar not null,
|
|
ip varchar,
|
|
last_seen timestamp,
|
|
max_bit_rate int default 0,
|
|
transcoding_id varchar,
|
|
report_real_path bool default FALSE not null,
|
|
scrobble_enabled bool default true
|
|
);
|
|
|
|
INSERT INTO player_dg_tmp(
|
|
id, name, user_agent, user_id, client, ip, last_seen, max_bit_rate,
|
|
transcoding_id, report_real_path, scrobble_enabled
|
|
)
|
|
SELECT
|
|
id, name, user_agent,
|
|
IFNULL(
|
|
(select id from user where user_name = player.user_name), 'UNKNOWN_USERNAME'
|
|
),
|
|
client, ip_address, last_seen, max_bit_rate, transcoding_id, report_real_path, scrobble_enabled
|
|
FROM player;
|
|
|
|
DELETE FROM player_dg_tmp WHERE user_id = 'UNKNOWN_USERNAME';
|
|
DROP TABLE player;
|
|
ALTER TABLE player_dg_tmp RENAME TO player;
|
|
|
|
CREATE INDEX IF NOT EXISTS player_match
|
|
on player (client, user_agent, user_id);
|
|
CREATE INDEX IF NOT EXISTS player_name
|
|
on player (name);
|
|
`)
|
|
|
|
return err
|
|
}
|
|
|
|
func downPlayerUseUserIdOverUsername(ctx context.Context, tx *sql.Tx) error {
|
|
// This code is executed when the migration is rolled back.
|
|
return nil
|
|
}
|