mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 01:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FLEXIAPI-398 List all the availables Spaces domains when importing, fix...

Browse source
This commit is contained in:
Timothée Jaussoin 2025-10-08 09:32:11 +00:00
parent 84fdb380d7
commit 92978bf256
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flexiapi/app/Http/Controllers/Admin/AccountImportController.php
View file

@ -23,6 +23,7 @@ use App\Account;
use App\ExternalAccount;
use App\Password;
use App\PhoneCountry;
use App\Space;
use App\Http\Controllers\Controller;
use Carbon\Carbon;
use Illuminate\Support\Collection;
@ -44,7 +45,9 @@ class AccountImportController extends Controller
public function create(Request $request)
{
return view('admin.account.import.create', [
'domains' => Account::select('domain')->distinct()->get()->pluck('domain')
'domains' => $request->user()->superAdmin
? Space::pluck('domain')
: [$request->user()->domain]
]);
}
@ -52,10 +55,12 @@ class AccountImportController extends Controller
{
$request->validate([
'csv' => ['required', File::types(['csv', 'txt'])],
'domain' => 'required|exists:accounts'
'domain' => 'required|exists:spaces,domain'
]);
$domain = $request->get('domain');
$domain = $request->user()->superAdmin
? $request->get('domain')
: $request->user()->domain;
/**
* General formating checking
@ -192,10 +197,14 @@ class AccountImportController extends Controller
? Storage::putFile($this->importDirectory, $request->file('csv'))
: null;
if ($filePath == false) {
$this->errors['The CSV file was not imported properly on the server'] = '';
}
return view('admin.account.import.check', [
'linesCount' => $lines->count(),
'errors' => $this->errors,
'domain' => $request->get('domain'),
'domain' => $domain,
'filePath' => $filePath
]);
}
@ -204,9 +213,13 @@ class AccountImportController extends Controller
{
$request->validate([
'file_path' => 'required',
'domain' => 'required|exists:accounts'
'domain' => 'required|exists:spaces,domain'
]);
$domain = $request->user()->superAdmin
? $request->get('domain')
: $request->user()->domain;
$lines = $this->csvToCollection(storage_path('app/' . $request->get('file_path')));
$accounts = [];
@ -250,7 +263,7 @@ class AccountImportController extends Controller
array_push($accounts, [
'username' => $line->username,
'domain' => $request->get('domain'),
'domain' => $domain,
'email' => $line->email,
'activated' => $line->status == 'active',
'ip_address' => '127.0.0.1',
@ -265,9 +278,10 @@ class AccountImportController extends Controller
// Set admins accounts
foreach ($admins as $username) {
$account = Account::where('username', $username)
->where('domain', $request->get('domain'))
->where('domain', $domain)
->first();
$account->admin = true;
$account->save();
}
// Set passwords
@ -275,7 +289,7 @@ class AccountImportController extends Controller
$passwordsToInsert = [];
$passwordAccounts = Account::whereIn('username', array_keys($passwords))
->where('domain', $request->get('domain'))
->where('domain', $domain)
->get();
$algorithm = config('app.account_default_password_algorithm');
@ -285,7 +299,7 @@ class AccountImportController extends Controller
'account_id' => $passwordAccount->id,
'password' => bchash(
$passwordAccount->username,
space()?->account_realm ?? $request->get('domain'),
space()?->account_realm ?? $domain,
$passwords[$passwordAccount->username],
$algorithm
),
@ -300,7 +314,7 @@ class AccountImportController extends Controller
$externalAccountsToInsert = [];
$externalAccounts = Account::whereIn('username', array_keys($externals))
->where('domain', $request->get('domain'))
->where('domain', $domain)
->get();
foreach ($externalAccounts as $externalAccount) {
@ -314,7 +328,7 @@ class AccountImportController extends Controller
// Set phone accounts
foreach ($phones as $username => $phone) {
$account = Account::where('username', $username)
->where('domain', $request->get('domain'))
->where('domain', $domain)
->first();
$account->phone = $phone;
}