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

Fix #130 Drop the group column in the Accounts table

Browse source
This commit is contained in:
Timothée Jaussoin 2023-12-11 14:54:58 +00:00
parent 485d088219
commit b409e37ab1
5 changed files with 125 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flexiapi/app/Account.php
View file

@ -148,26 +148,12 @@ class Account extends Authenticatable
return $this->hasMany(DigestNonce::class);
}
public function authTokens()
{
return $this->hasMany(AuthToken::class);
}
public function passwords()
{
return $this->hasMany(Password::class);
}
public function phoneChangeCode()
{
return $this->hasOne(PhoneChangeCode::class);
}
public function emailChangeCode()
{
return $this->hasOne(EmailChangeCode::class);
}
public function types()
{
return $this->belongsToMany(AccountType::class);
@ -193,6 +179,24 @@ class Account extends Authenticatable
return $this->hasMany(StatisticsMessageDevice::class, ['to_username', 'to_domain'], ['username', 'domain']);
}
/**
* Tokens and codes
*/
public function phoneChangeCode()
{
return $this->hasOne(PhoneChangeCode::class);
}
public function emailChangeCode()
{
return $this->hasOne(EmailChangeCode::class);
}
public function authTokens()
{
return $this->hasMany(AuthToken::class);
}
/**
* Attributes
*/

20
flexiapi/composer.json
View file

@ -11,23 +11,23 @@
"php": ">=8.0.2",
"anhskohbo/no-captcha": "^3.5",
"awobaz/compoships": "^2.2",
"doctrine/dbal": "^3.6.6",
"endroid/qr-code": "^4.8.2",
"doctrine/dbal": "^3.6",
"endroid/qr-code": "^4.8",
"fakerphp/faker": "^1.23",
"laravel/framework": "^9.52.15",
"namoshek/laravel-redis-sentinel": "^0.1.2",
"laravel/framework": "^9.52",
"namoshek/laravel-redis-sentinel": "^0.1",
"ovh/ovh": "^3.2",
"parsedown/laravel": "^1.2.1",
"phpunit/phpunit": "^9.6.11",
"parsedown/laravel": "^1.2",
"phpunit/phpunit": "^9.6",
"react/socket": "^1.14",
"respect/validation": "^2.2.4"
"respect/validation": "^2.2"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.9.2",
"mockery/mockery": "^1.6.6",
"barryvdh/laravel-debugbar": "^3.9",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^6.4",
"phpmd/phpmd": "^2.13",
"squizlabs/php_codesniffer": "^3.7.2"
"squizlabs/php_codesniffer": "^3.7"
},
"config": {
"platform": {

127
flexiapi/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b6a450b1e7adf4c259121350856f83a6",
"content-hash": "c40b2725aff311036d760b67e577fdef",
"packages": [
{
"name": "anhskohbo/no-captcha",
@ -2807,16 +2807,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.72.0",
"version": "2.72.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b"
"reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a6885fcbad2ec4360b0e200ee0da7d9b7c90786b",
"reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
"reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
"shasum": ""
},
"require": {
@ -2910,7 +2910,7 @@
"type": "tidelift"
}
],
"time": "2023-11-28T10:13:25+00:00"
"time": "2023-12-08T23:47:49+00:00"
},
{
"name": "nette/schema",
@ -3062,16 +3062,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.17.1",
"version": "v4.18.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
"reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
"reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
"shasum": ""
},
"require": {
@ -3112,9 +3112,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
},
"time": "2023-08-13T19:53:39+00:00"
"time": "2023-12-10T21:03:43+00:00"
},
{
"name": "nunomaduro/termwind",
@ -8445,23 +8445,23 @@
},
{
"name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.6",
"version": "v2.2.7",
"source": {
"type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
"reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c"
"reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c",
"reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
"reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^5.5 || ^7.0 || ^8.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
@ -8492,9 +8492,9 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"support": {
"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
"source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6"
"source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
},
"time": "2023-01-03T09:29:04+00:00"
"time": "2023-12-08T13:03:43+00:00"
},
{
"name": "vlucas/phpdotenv",
@ -9125,16 +9125,16 @@
},
{
"name": "mockery/mockery",
"version": "1.6.6",
"version": "1.6.7",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
"reference": "b8e0bb7d8c604046539c1115994632c74dcb361e"
"reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e",
"reference": "b8e0bb7d8c604046539c1115994632c74dcb361e",
"url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
"reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
"shasum": ""
},
"require": {
@ -9147,9 +9147,7 @@
},
"require-dev": {
"phpunit/phpunit": "^8.5 || ^9.6.10",
"psalm/plugin-phpunit": "^0.18.4",
"symplify/easy-coding-standard": "^11.5.0",
"vimeo/psalm": "^4.30"
"symplify/easy-coding-standard": "^12.0.8"
},
"type": "library",
"autoload": {
@ -9206,7 +9204,7 @@
"security": "https://github.com/mockery/mockery/security/advisories",
"source": "https://github.com/mockery/mockery"
},
"time": "2023-08-09T00:03:52+00:00"
"time": "2023-12-10T02:24:34+00:00"
},
{
"name": "nunomaduro/collision",
@ -9298,16 +9296,16 @@
},
{
"name": "pdepend/pdepend",
"version": "2.16.0",
"version": "2.16.1",
"source": {
"type": "git",
"url": "https://github.com/pdepend/pdepend.git",
"reference": "8dfc0c46529e2073fa97986552f80646eedac562"
"reference": "66ceb05eaa8bf358574143c974b04463911bc700"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pdepend/pdepend/zipball/8dfc0c46529e2073fa97986552f80646eedac562",
"reference": "8dfc0c46529e2073fa97986552f80646eedac562",
"url": "https://api.github.com/repos/pdepend/pdepend/zipball/66ceb05eaa8bf358574143c974b04463911bc700",
"reference": "66ceb05eaa8bf358574143c974b04463911bc700",
"shasum": ""
},
"require": {
@ -9320,7 +9318,6 @@
"require-dev": {
"easy-doc/easy-doc": "0.0.0|^1.2.3",
"gregwar/rst": "^1.0",
"phpunit/phpunit": "^4.8.36|^5.7.27",
"squizlabs/php_codesniffer": "^2.0.0"
},
"bin": [
@ -9350,7 +9347,7 @@
],
"support": {
"issues": "https://github.com/pdepend/pdepend/issues",
"source": "https://github.com/pdepend/pdepend/tree/2.16.0"
"source": "https://github.com/pdepend/pdepend/tree/2.16.1"
},
"funding": [
{
@ -9358,26 +9355,26 @@
"type": "tidelift"
}
],
"time": "2023-11-29T08:52:35+00:00"
"time": "2023-12-10T18:38:19+00:00"
},
{
"name": "phpmd/phpmd",
"version": "2.14.1",
"version": "2.15.0",
"source": {
"type": "git",
"url": "https://github.com/phpmd/phpmd.git",
"reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8"
"reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpmd/phpmd/zipball/442fc2c34edcd5198b442d8647c7f0aec3afabe8",
"reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8",
"url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0",
"reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0",
"shasum": ""
},
"require": {
"composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
"ext-xml": "*",
"pdepend/pdepend": "^2.15.1",
"pdepend/pdepend": "^2.16.1",
"php": ">=5.3.9"
},
"require-dev": {
@ -9386,7 +9383,6 @@
"ext-simplexml": "*",
"gregwar/rst": "^1.0",
"mikey179/vfsstream": "^1.6.8",
"phpunit/phpunit": "^4.8.36 || ^5.7.27",
"squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2"
},
"bin": [
@ -9434,7 +9430,7 @@
"support": {
"irc": "irc://irc.freenode.org/phpmd",
"issues": "https://github.com/phpmd/phpmd/issues",
"source": "https://github.com/phpmd/phpmd/tree/2.14.1"
"source": "https://github.com/phpmd/phpmd/tree/2.15.0"
},
"funding": [
{
@ -9442,20 +9438,20 @@
"type": "tidelift"
}
],
"time": "2023-09-28T13:07:44+00:00"
"time": "2023-12-11T08:22:20+00:00"
},
{
"name": "squizlabs/php_codesniffer",
"version": "3.7.2",
"version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
"reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
"reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
"reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
"shasum": ""
},
"require": {
@ -9465,7 +9461,7 @@
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
},
"bin": [
"bin/phpcs",
@ -9484,22 +9480,45 @@
"authors": [
{
"name": "Greg Sherwood",
"role": "lead"
"role": "Former lead"
},
{
"name": "Juliette Reinders Folmer",
"role": "Current lead"
},
{
"name": "Contributors",
"homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
}
],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
"keywords": [
"phpcs",
"standards",
"static analysis"
],
"support": {
"issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
"source": "https://github.com/squizlabs/PHP_CodeSniffer",
"wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
"issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
"security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
"source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
"wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
},
"time": "2023-02-22T23:07:41+00:00"
"funding": [
{
"url": "https://github.com/PHPCSStandards",
"type": "github"
},
{
"url": "https://github.com/jrfnl",
"type": "github"
},
{
"url": "https://opencollective.com/php_codesniffer",
"type": "open_collective"
}
],
"time": "2023-12-08T12:32:31+00:00"
},
{
"name": "symfony/config",

BIN
flexiapi/composer.phar
View file

Binary file not shown.

24
flexiapi/database/migrations/2023_12_11_135122_drop_group_from_accounts_table.php Normal file
View file

@ -0,0 +1,24 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up()
{
Schema::table('accounts', function (Blueprint $table) {
$table->dropIndex('accounts_group_index');
$table->dropColumn('group');
});
}
public function down()
{
Schema::table('accounts', function (Blueprint $table) {
$table->string('group', 64)->nullable();
$table->index('group');
});
}
};