Skip to content

fix: Fix M365 import bugs concerning aliases #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marien-probesys merged 3 commits into from
Jan 15, 2026
Merged

fix: Fix M365 import bugs concerning aliases #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
927adcc
fix(m365): Fix checking proxy address when importing alias
marien-probesys Jan 15, 2026
ed4cff1
fix(m365): Don't mark initial user as an alias of himself
marien-probesys Jan 15, 2026
f24fb50
chore(m365): Refactor creation of aliases
marien-probesys Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions app/migrations/Version20260115151631.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

final class Version20260115151631 extends AbstractMigration
{
public function getDescription(): string
{
return 'Fix M365 users marked as aliases of themselves.';
}

public function up(Schema $schema): void
{
$this->addSql('UPDATE users SET original_user_id = null WHERE original_user_id = id');
}

public function down(Schema $schema): void
{
// Do nothing on purpose
}
}
60 changes: 42 additions & 18 deletions app/src/Command/Office365ImportCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use App\Entity\Office365Connector;
use App\Entity\User as User;
use App\Service\MailaddrService;
use App\Util\Email;
use Doctrine\ORM\EntityManagerInterface;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
Expand Down Expand Up @@ -176,25 +177,48 @@ private function importUsers(string $token): void
private function addAliases(User $user, array $proxyAdresses): array
{
$aliases = [];
foreach ($proxyAdresses as $proxyAdresse) {
if (strpos($proxyAdresse, "smtp") !== false) {
$aliasEmail = explode('smtp:', $proxyAdresse)[1];
$domainAlias = explode('@', $aliasEmail)[1];
if ($domainAlias == $this->connector->getDomain()->getDomain()) {
$alias = $this->em->getRepository(User::class)->findOneBy(['email' => $aliasEmail]);
if (!$alias) {
$alias = clone $user;
}
$alias->setUid(null);
$alias->setEmail($aliasEmail);
$alias->setUserName($aliasEmail);
$alias->setOriginalUser($user);
$alias->setOriginConnector($this->connector);
$this->em->persist($alias);

$aliases[] = $alias;
}
foreach ($proxyAdresses as $proxyAdress) {
if (!str_starts_with(strtolower($proxyAdress), 'smtp:')) {
continue;
}

$aliasEmail = substr($proxyAdress, strlen('smtp:'));
if (!Email::validate($aliasEmail)) {
continue;
}

// Don't mark the initial user as an alias of himself
if ($aliasEmail === $user->getEmail()) {
continue;
}

// Get the domain associated to the email address
$domainName = Email::extractDomain($aliasEmail);
if (!$domainName) {
continue;
}

$domain = $this->em->getRepository(Domain::class)->findOneByDomain($domainName);
if (!$domain || $domain->getId() !== $this->connector->getDomain()->getId()) {
continue;
}

// Create the alias if it doesn't exist yet
$alias = $this->em->getRepository(User::class)->findOneBy(['email' => $aliasEmail]);
if (!$alias) {
$alias = new User();
$alias->setOriginConnector($this->connector);
}

// And update information
$alias->setEmail($aliasEmail);
$alias->setUsername($aliasEmail);
$alias->setOriginalUser($user);
$alias->setDomain($domain);

$this->em->persist($alias);

$aliases[] = $alias;
}
return $aliases;
}
Expand Down