From b31d72625dd32143a45277528b90bb67a881f249 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 5 May 2021 15:26:28 +0200 Subject: Plugin user.getAuthUser is now async So we can load the full user --- server/tests/fixtures/peertube-plugin-test-four/main.js | 5 +++-- server/tests/plugins/plugin-helpers.ts | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'server/tests') diff --git a/server/tests/fixtures/peertube-plugin-test-four/main.js b/server/tests/fixtures/peertube-plugin-test-four/main.js index 6ed0c20d2..b9b207b81 100644 --- a/server/tests/fixtures/peertube-plugin-test-four/main.js +++ b/server/tests/fixtures/peertube-plugin-test-four/main.js @@ -88,8 +88,8 @@ async function register ({ return res.json({ routerRoute }) }) - router.get('/user', (req, res) => { - const user = peertubeHelpers.user.getAuthUser(res) + router.get('/user', async (req, res) => { + const user = await peertubeHelpers.user.getAuthUser(res) if (!user) return res.sendStatus(404) const isAdmin = user.role === 0 @@ -98,6 +98,7 @@ async function register ({ return res.json({ username: user.username, + displayName: user.Account.name, isAdmin, isModerator, isUser diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts index 20020ec41..f72de8229 100644 --- a/server/tests/plugins/plugin-helpers.ts +++ b/server/tests/plugins/plugin-helpers.ts @@ -133,6 +133,7 @@ describe('Test plugin helpers', function () { }) expect(res.body.username).to.equal('root') + expect(res.body.displayName).to.equal('root') expect(res.body.isAdmin).to.be.true expect(res.body.isModerator).to.be.false expect(res.body.isUser).to.be.false -- cgit v1.2.3