From 8bb71f2e332726c207318e44b95e784f9740dc40 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 5 May 2020 09:44:53 +0200 Subject: Add auth plugin info in users list --- server/models/account/user.ts | 4 +++- server/tests/plugins/id-and-pass-auth.ts | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 1bff955df..260c1b28e 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts @@ -806,7 +806,9 @@ export class UserModel extends Model { videoChannels: [], - createdAt: this.createdAt + createdAt: this.createdAt, + + pluginAuth: this.pluginAuth } if (parameters.withAdminFlags) { diff --git a/server/tests/plugins/id-and-pass-auth.ts b/server/tests/plugins/id-and-pass-auth.ts index 97df4c1fd..cbba638c2 100644 --- a/server/tests/plugins/id-and-pass-auth.ts +++ b/server/tests/plugins/id-and-pass-auth.ts @@ -12,7 +12,7 @@ import { updateMyUser, userLogin, wait, - login, refreshToken, getConfig, updatePluginSettings + login, refreshToken, getConfig, updatePluginSettings, getUsersList } from '../../../shared/extra-utils' import { User, UserRole, ServerConfig } from '@shared/models' import { expect } from 'chai' @@ -225,6 +225,20 @@ describe('Test id and pass auth plugins', function () { expect(crashAuth).to.not.exist }) + it('Should display plugin auth information in users list', async function () { + const res = await getUsersList(server.url, server.accessToken) + + const users: User[] = res.body.data + + const root = users.find(u => u.username === 'root') + const crash = users.find(u => u.username === 'crash') + const laguna = users.find(u => u.username === 'laguna') + + expect(root.pluginAuth).to.be.null + expect(crash.pluginAuth).to.equal('peertube-plugin-test-id-pass-auth-one') + expect(laguna.pluginAuth).to.equal('peertube-plugin-test-id-pass-auth-two') + }) + after(async function () { await cleanupTests([ server ]) }) -- cgit v1.2.3