/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import 'mocha'
import { expect } from 'chai'
-import { HttpStatusCode } from '@shared/core-utils'
+import { wait } from '@shared/core-utils'
+import { HttpStatusCode, UserAdminFlag, UserRole } from '@shared/models'
import {
cleanupTests,
- decodeQueryString,
createSingleServer,
- PluginsCommand,
+ decodeQueryString,
PeerTubeServer,
- setAccessTokensToServers,
- wait
-} from '@shared/extra-utils'
-import { UserRole } from '@shared/models'
+ PluginsCommand,
+ setAccessTokensToServers
+} from '@shared/server-commands'
async function loginExternal (options: {
server: PeerTubeServer
authName: string
username: string
query?: any
- statusCodeExpected?: HttpStatusCode
- statusCodeExpectedStep2?: HttpStatusCode
+ expectedStatus?: HttpStatusCode
+ expectedStatusStep2?: HttpStatusCode
}) {
const res = await options.server.plugins.getExternalAuth({
npmName: options.npmName,
npmVersion: '0.0.1',
authName: options.authName,
query: options.query,
- expectedStatus: options.statusCodeExpected || HttpStatusCode.FOUND_302
+ expectedStatus: options.expectedStatus || HttpStatusCode.FOUND_302
})
if (res.status !== HttpStatusCode.FOUND_302) return
const resLogin = await options.server.login.loginUsingExternalToken({
username: options.username,
externalAuthToken: externalAuthToken as string,
- expectedStatus: options.statusCodeExpectedStep2
+ expectedStatus: options.expectedStatusStep2
})
return resLogin.body
let kefkaAccessToken: string
let kefkaRefreshToken: string
+ let kefkaId: number
let externalAuthToken: string
before(async function () {
this.timeout(30000)
- server = await createSingleServer(1)
+ server = await createSingleServer(1, {
+ rates_limit: {
+ login: {
+ max: 30
+ }
+ }
+ })
+
await setAccessTokensToServers([ server ])
for (const suffix of [ 'one', 'two', 'three' ]) {
const config = await server.config.getConfig()
const auths = config.plugin.registeredExternalAuths
- expect(auths).to.have.lengthOf(8)
+ expect(auths).to.have.lengthOf(9)
const auth2 = auths.find((a) => a.authName === 'external-auth-2')
expect(auth2).to.exist
expectedStatus: HttpStatusCode.BAD_REQUEST_400
})
- await server.servers.waitUntilLog('expired external auth token', 2)
+ await server.servers.waitUntilLog('expired external auth token', 4)
})
it('Should auto login Cyan, create the user and use the token', async function () {
expect(body.username).to.equal('cyan')
expect(body.account.displayName).to.equal('cyan')
expect(body.email).to.equal('cyan@example.com')
- expect(body.role).to.equal(UserRole.USER)
+ expect(body.role.id).to.equal(UserRole.USER)
+ expect(body.adminFlags).to.equal(UserAdminFlag.NONE)
+ expect(body.videoQuota).to.equal(5242880)
+ expect(body.videoQuotaDaily).to.equal(-1)
}
})
expect(body.username).to.equal('kefka')
expect(body.account.displayName).to.equal('Kefka Palazzo')
expect(body.email).to.equal('kefka@example.com')
- expect(body.role).to.equal(UserRole.ADMINISTRATOR)
+ expect(body.role.id).to.equal(UserRole.ADMINISTRATOR)
+ expect(body.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST)
+ expect(body.videoQuota).to.equal(42000)
+ expect(body.videoQuotaDaily).to.equal(42100)
+
+ kefkaId = body.id
}
})
expect(body.username).to.equal('cyan')
expect(body.account.displayName).to.equal('Cyan Garamonde')
expect(body.account.description).to.equal('Retainer to the king of Doma')
- expect(body.role).to.equal(UserRole.USER)
+ expect(body.role.id).to.equal(UserRole.USER)
+ })
+
+ it('Should login Kefka and update the profile', async function () {
+ {
+ await server.users.update({ userId: kefkaId, videoQuota: 43000, videoQuotaDaily: 43100 })
+ await server.users.updateMe({ token: kefkaAccessToken, displayName: 'kefka updated' })
+
+ const body = await server.users.getMyInfo({ token: kefkaAccessToken })
+ expect(body.username).to.equal('kefka')
+ expect(body.account.displayName).to.equal('kefka updated')
+ expect(body.videoQuota).to.equal(43000)
+ expect(body.videoQuotaDaily).to.equal(43100)
+ }
+
+ {
+ const res = await loginExternal({
+ server,
+ npmName: 'test-external-auth-one',
+ authName: 'external-auth-2',
+ username: 'kefka'
+ })
+
+ kefkaAccessToken = res.access_token
+ kefkaRefreshToken = res.refresh_token
+
+ const body = await server.users.getMyInfo({ token: kefkaAccessToken })
+ expect(body.username).to.equal('kefka')
+ expect(body.account.displayName).to.equal('Kefka Palazzo')
+ expect(body.videoQuota).to.equal(42000)
+ expect(body.videoQuotaDaily).to.equal(43100)
+ }
})
it('Should not update an external auth email', async function () {
username: 'kefka'
},
username: 'kefka',
- statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+ expectedStatus: HttpStatusCode.NOT_FOUND_404
})
})
const config = await server.config.getConfig()
const auths = config.plugin.registeredExternalAuths
- expect(auths).to.have.lengthOf(7)
+ expect(auths).to.have.lengthOf(8)
const auth1 = auths.find(a => a.authName === 'external-auth-2')
expect(auth1).to.not.exist
username: 'cyan'
},
username: 'cyan',
- statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+ expectedStatus: HttpStatusCode.NOT_FOUND_404
})
await server.login.login({ user: { username: 'cyan', password: null }, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
npmName: 'test-external-auth-two',
authName: 'external-auth-4',
username: 'kefka2',
- statusCodeExpectedStep2: HttpStatusCode.BAD_REQUEST_400
+ expectedStatusStep2: HttpStatusCode.BAD_REQUEST_400
})
await loginExternal({
npmName: 'test-external-auth-two',
authName: 'external-auth-4',
username: 'kefka',
- statusCodeExpectedStep2: HttpStatusCode.BAD_REQUEST_400
+ expectedStatusStep2: HttpStatusCode.BAD_REQUEST_400
})
})
- it('Should not login an existing user', async function () {
+ it('Should not login an existing user email', async function () {
await server.users.create({ username: 'existing_user', password: 'super_password' })
await loginExternal({
npmName: 'test-external-auth-two',
authName: 'external-auth-6',
username: 'existing_user',
- statusCodeExpectedStep2: HttpStatusCode.BAD_REQUEST_400
+ expectedStatusStep2: HttpStatusCode.BAD_REQUEST_400
})
})
+ it('Should be able to login an existing user username and channel', async function () {
+ await server.users.create({ username: 'existing_user2' })
+ await server.users.create({ username: 'existing_user2-1_channel' })
+
+ // Test twice to ensure we don't generate a username on every login
+ for (let i = 0; i < 2; i++) {
+ const res = await loginExternal({
+ server,
+ npmName: 'test-external-auth-two',
+ authName: 'external-auth-7',
+ username: 'existing_user2'
+ })
+
+ const token = res.access_token
+
+ const myInfo = await server.users.getMyInfo({ token })
+ expect(myInfo.username).to.equal('existing_user2-1')
+
+ expect(myInfo.videoChannels[0].name).to.equal('existing_user2-1_channel-1')
+ }
+ })
+
it('Should display the correct configuration', async function () {
const config = await server.config.getConfig()
const auths = config.plugin.registeredExternalAuths
- expect(auths).to.have.lengthOf(6)
+ expect(auths).to.have.lengthOf(7)
const auth2 = auths.find((a) => a.authName === 'external-auth-2')
expect(auth2).to.not.exist
projects / github / Chocobozzz / PeerTube.git / blobdiff