open-source-mirrors
/
overseerr
mirror of https://github.com/sct/overseerr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(plex): do not fail to import Plex users when Plex Home has managed users (#1699)

Browse Source 
* fix(plex): do not fail to import Plex users when Plex Home has managed users

* fix: default display name to email when user has no username

also, do not set username or plexUsername when it is the same as the user's email address

* fix(ui): user display name placeholder should reflect fallback logic if username is not set

* fix(ui): hide email addresses of other users if logged-in user does not have Manage Users permission

* fix: always set Plex username even if same as user's email

* fix: remove unnecessary permission check

* fix: transform email addresses to lowercase
pull/1700/head
TheCatLady 4 years ago committed by GitHub
parent 6603dffe95
commit 310cdb36df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File

12
server/entity/User.ts
Unescape View File

@ -48,11 +48,17 @@ export class User {
@PrimaryGeneratedColumn()
public id: number;
@Column({ unique: true })
@Column({
unique: true,
transformer: {
from: (value: string): string => value.toLowerCase(),
to: (value: string): string => value.toLowerCase(),
},
})
public email: string;
@Column({ nullable: true })
public plexUsername: string;
public plexUsername?: string;
@Column({ nullable: true })
public username?: string;
@ -220,7 +226,7 @@ export class User {
@AfterLoad()
public setDisplayName(): void {
this.displayName = this.username || this.plexUsername;
this.displayName = this.username || this.plexUsername || this.email;
}
public async getQuota(): Promise<QuotaResponse> {

9
server/routes/auth.ts
Unescape View File

@ -43,7 +43,7 @@ authRoutes.post('/plex', async (req, res, next) => {
let user = await userRepository
.createQueryBuilder('user')
.where('user.plexId = :id', { id: account.id })
.orWhere('LOWER(user.email) = :email', {
.orWhere('user.email = :email', {
email: account.email.toLowerCase(),
})
.getOne();
@ -65,9 +65,6 @@ authRoutes.post('/plex', async (req, res, next) => {
user.plexId = account.id;
}
if (user.username === account.username) {
user.username = '';
}
await userRepository.save(user);
} else {
// Here we check if it's the first user. If it is, we create the user with no check
@ -177,7 +174,7 @@ authRoutes.post('/local', async (req, res, next) => {
const user = await userRepository
.createQueryBuilder('user')
.select(['user.id', 'user.password'])
.where('LOWER(user.email) = :email', { email: body.email.toLowerCase() })
.where('user.email = :email', { email: body.email.toLowerCase() })
.getOne();
const isCorrectCredentials = await user?.passwordMatch(body.password);
@ -244,7 +241,7 @@ authRoutes.post('/reset-password', async (req, res) => {
const user = await userRepository
.createQueryBuilder('user')
.where('LOWER(user.email) = :email', { email: body.email.toLowerCase() })
.where('user.email = :email', { email: body.email.toLowerCase() })
.getOne();
if (user) {

80
server/routes/user/index.ts
Unescape View File

@ -31,7 +31,7 @@ router.get('/', async (req, res, next) => {
break;
case 'displayname':
query = query.orderBy(
'(CASE WHEN user.username IS NULL THEN user.plexUsername ELSE user.username END)',
"(CASE WHEN (user.username IS NULL OR user.username = '') THEN (CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN user.email ELSE LOWER(user.plexUsername) END) ELSE LOWER(user.username) END)",
'ASC'
);
break;
@ -84,7 +84,7 @@ router.post(
const existingUser = await userRepository
.createQueryBuilder('user')
.where('LOWER(user.email) = :email', {
.where('user.email = :email', {
email: body.email.toLowerCase(),
})
.getOne();
@ -396,51 +396,45 @@ router.post(
for (const rawUser of plexUsersResponse.MediaContainer.User) {
const account = rawUser.$;
const user = await userRepository
.createQueryBuilder('user')
.where('user.plexId = :id', { id: account.id })
.orWhere('LOWER(user.email) = :email', {
email: account.email.toLowerCase(),
})
.getOne();
if (user) {
// Update the user's avatar with their Plex thumbnail, in case it changed
user.avatar = account.thumb;
user.email = account.email;
user.plexUsername = account.username;
// In case the user was previously a local account
if (user.userType === UserType.LOCAL) {
user.userType = UserType.PLEX;
user.plexId = parseInt(account.id);
if (user.username === account.username) {
user.username = '';
if (account.email) {
const user = await userRepository
.createQueryBuilder('user')
.where('user.plexId = :id', { id: account.id })
.orWhere('user.email = :email', {
email: account.email.toLowerCase(),
})
.getOne();
if (user) {
// Update the user's avatar with their Plex thumbnail, in case it changed
user.avatar = account.thumb;
user.email = account.email;
user.plexUsername = account.username;
// In case the user was previously a local account
if (user.userType === UserType.LOCAL) {
user.userType = UserType.PLEX;
user.plexId = parseInt(account.id);
}
await userRepository.save(user);
} else {
if (await mainPlexTv.checkUserAccess(parseInt(account.id))) {
const newUser = new User({
plexUsername: account.username,
email: account.email,
permissions: settings.main.defaultPermissions,
plexId: parseInt(account.id),
plexToken: '',
avatar: account.thumb,
userType: UserType.PLEX,
});
await userRepository.save(newUser);
createdUsers.push(newUser);
}
}
await userRepository.save(user);
} else {
// Check to make sure it's a real account
if (
account.email &&
account.username &&
(await mainPlexTv.checkUserAccess(parseInt(account.id)))
) {
const newUser = new User({
plexUsername: account.username,
email: account.email,
permissions: settings.main.defaultPermissions,
plexId: parseInt(account.id),
plexToken: '',
avatar: account.thumb,
userType: UserType.PLEX,
});
await userRepository.save(newUser);
createdUsers.push(newUser);
}
}
}
return res.status(201).json(User.filterMany(createdUsers));
} catch (e) {
next({ status: 500, message: e.message });

18
src/components/RequestModal/AdvancedRequester/index.tsx
Unescape View File

@ -522,9 +522,12 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
<span className="block ml-3">
{selectedUser.displayName}
</span>
<span className="ml-1 text-gray-400 truncate">
({selectedUser.email})
</span>
{selectedUser.displayName.toLowerCase() !==
selectedUser.email && (
<span className="ml-1 text-gray-400 truncate">
({selectedUser.email})
</span>
)}
</span>
<span className="absolute inset-y-0 right-0 flex items-center pr-2 text-gray-500 pointer-events-none">
<ChevronDownIcon className="w-5 h-5" />
@ -569,9 +572,12 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
<span className="flex-shrink-0 block ml-3">
{user.displayName}
</span>
<span className="ml-1 text-gray-400 truncate">
({user.email})
</span>
{user.displayName.toLowerCase() !==
user.email && (
<span className="ml-1 text-gray-400 truncate">
({user.email})
</span>
)}
</span>
{selected && (
<span

8
src/components/UserList/index.tsx
Unescape View File

@ -602,9 +602,11 @@ const UserList: React.FC = () => {
{user.displayName}
</a>
</Link>
<div className="text-sm leading-5 text-gray-300">
{user.email}
</div>
{user.displayName.toLowerCase() !== user.email && (
<div className="text-sm leading-5 text-gray-300">
{user.email}
</div>
)}
</div>
</div>
</Table.TD>

2
src/components/UserProfile/ProfileHeader/index.tsx
Unescape View File

@ -65,7 +65,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
{user.displayName}
</a>
</Link>
{user.email && (
{user.email && user.displayName.toLowerCase() !== user.email && (
<span className="text-sm text-gray-400 sm:text-lg sm:ml-2">
({user.email})
</span>

4
src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
Unescape View File

@ -188,7 +188,9 @@ const UserGeneralSettings: React.FC = () => {
id="displayName"
name="displayName"
type="text"
placeholder={user?.displayName}
placeholder={
user?.plexUsername ? user.plexUsername : user?.email
}
/>
</div>
{errors.displayName && touched.displayName && (

Write Preview
Loading…
Cancel
Save