yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 18:29:27 +02:00
Code Issues Releases Wiki Activity

Fix external auth email/password update

Browse source 
Also check if an actor does not already exist when creating the user
This commit is contained in:
Chocobozzz 2020-05-20 10:04:44 +02:00
parent 51539e95d9
commit 9a7fd9600b
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/lib/oauth-model.ts
View file

@ -14,6 +14,7 @@ import { UserAdminFlag } from '@shared/models/users/user-flag.model'
import { createUserAccountAndChannelAndPlaylist } from './user'
import { UserRole } from '@shared/models/users/user-role'
import { PluginManager } from '@server/lib/plugins/plugin-manager'
import { ActorModel } from '@server/models/activitypub/actor'
type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpiresAt: Date, refreshTokenExpiresAt: Date }
@ -109,6 +110,9 @@ async function getUser (usernameOrEmail?: string, password?: string) {
let user = await UserModel.loadByEmail(obj.user.email)
if (!user) user = await createUserFromExternal(obj.pluginName, obj.user)
// Cannot create a user
if (!user) throw new AccessDeniedError('Cannot create such user: an actor with that name already exists.')
// If the user does not belongs to a plugin, it was created before its installation
// Then we just go through a regular login process
if (user.pluginAuth !== null) {
@ -208,6 +212,10 @@ async function createUserFromExternal (pluginAuth: string, options: {
role: UserRole
displayName: string
}) {
// Check an actor does not already exists with that name (removed user)
const actor = await ActorModel.loadLocalByName(options.username)
if (actor) return null
const userToCreate = new UserModel({
username: options.username,
password: null,