diff options
author | Chocobozzz <me@florianbigard.com> | 2021-01-11 13:53:08 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-01-11 13:53:08 +0100 |
commit | 1acb94750408490ce89264f92a14aceeffe81c96 (patch) | |
tree | f186a1c61a88e48d3720ad68722f42a5eeab96c1 /server | |
parent | f8be7bae3fa70e5402bc1b32c0c4865b8b5db97e (diff) | |
download | PeerTube-1acb94750408490ce89264f92a14aceeffe81c96.tar.gz PeerTube-1acb94750408490ce89264f92a14aceeffe81c96.tar.zst PeerTube-1acb94750408490ce89264f92a14aceeffe81c96.zip |
Retrieve user by id instead of username
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/api/users/me.ts | 2 | ||||
-rw-r--r-- | server/models/account/user.ts | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index b786d7f59..7ab089713 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts | |||
@@ -130,7 +130,7 @@ async function getUserVideoImports (req: express.Request, res: express.Response) | |||
130 | 130 | ||
131 | async function getUserInformation (req: express.Request, res: express.Response) { | 131 | async function getUserInformation (req: express.Request, res: express.Response) { |
132 | // We did not load channels in res.locals.user | 132 | // We did not load channels in res.locals.user |
133 | const user = await UserModel.loadForMeAPI(res.locals.oauth.token.user.username) | 133 | const user = await UserModel.loadForMeAPI(res.locals.oauth.token.user.id) |
134 | 134 | ||
135 | return res.json(user.toMeFormattedJSON()) | 135 | return res.json(user.toMeFormattedJSON()) |
136 | } | 136 | } |
diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 11003645c..534898f96 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts | |||
@@ -564,17 +564,17 @@ export class UserModel extends Model { | |||
564 | static loadByUsername (username: string): Promise<MUserDefault> { | 564 | static loadByUsername (username: string): Promise<MUserDefault> { |
565 | const query = { | 565 | const query = { |
566 | where: { | 566 | where: { |
567 | username: { [Op.iLike]: username } | 567 | username |
568 | } | 568 | } |
569 | } | 569 | } |
570 | 570 | ||
571 | return UserModel.findOne(query) | 571 | return UserModel.findOne(query) |
572 | } | 572 | } |
573 | 573 | ||
574 | static loadForMeAPI (username: string): Promise<MUserNotifSettingChannelDefault> { | 574 | static loadForMeAPI (id: number): Promise<MUserNotifSettingChannelDefault> { |
575 | const query = { | 575 | const query = { |
576 | where: { | 576 | where: { |
577 | username: { [Op.iLike]: username } | 577 | id |
578 | } | 578 | } |
579 | } | 579 | } |
580 | 580 | ||