yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Refactor user build and express file middlewares

Browse source
This commit is contained in:
Chocobozzz 2022-03-04 10:57:36 +01:00
parent 90370f7cc8
commit d3d3deaa7a
No known key found for this signature in database
GPG key ID: 583A612D890159BE
14 changed files with 91 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/lib/auth/oauth-model.ts
View file

@ -5,14 +5,14 @@ import { ActorModel } from '@server/models/actor/actor'
import { MOAuthClient } from '@server/types/models'
import { MOAuthTokenUser } from '@server/types/models/oauth/oauth-token'
import { MUser } from '@server/types/models/user/user'
import { UserAdminFlag } from '@shared/models/users/user-flag.model'
import { pick } from '@shared/core-utils'
import { UserRole } from '@shared/models/users/user-role'
import { logger } from '../../helpers/logger'
import { CONFIG } from '../../initializers/config'
import { OAuthClientModel } from '../../models/oauth/oauth-client'
import { OAuthTokenModel } from '../../models/oauth/oauth-token'
import { UserModel } from '../../models/user/user'
import { createUserAccountAndChannelAndPlaylist } from '../user'
import { buildUser, createUserAccountAndChannelAndPlaylist } from '../user'
import { TokensCache } from './tokens-cache'
type TokenInfo = {
@ -229,19 +229,13 @@ async function createUserFromExternal (pluginAuth: string, options: {
const actor = await ActorModel.loadLocalByName(options.username)
if (actor) return null
const userToCreate = new UserModel({
username: options.username,
const userToCreate = buildUser({
...pick(options, [ 'username', 'email', 'role' ]),
emailVerified: null,
password: null,
email: options.email,
nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY,
p2pEnabled: CONFIG.DEFAULTS.P2P.WEBAPP.ENABLED,
autoPlayVideo: true,
role: options.role,
videoQuota: CONFIG.USER.VIDEO_QUOTA,
videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY,
adminFlags: UserAdminFlag.NONE,
pluginAuth
}) as MUser
})
const { user } = await createUserAccountAndChannelAndPlaylist({
userToCreate,