diff --git a/flexiapi/app/Http/Controllers/Account/RegisterController.php b/flexiapi/app/Http/Controllers/Account/RegisterController.php index 9c38558..0aa1baa 100644 --- a/flexiapi/app/Http/Controllers/Account/RegisterController.php +++ b/flexiapi/app/Http/Controllers/Account/RegisterController.php @@ -118,7 +118,7 @@ class RegisterController extends Controller 'phone' => [ 'required', 'unique:external.aliases,alias', 'unique:external.accounts,username', - new WithoutSpaces, 'starts_with:+', 'phone:AUTO' + new WithoutSpaces, 'starts_with:+' ], 'g-recaptcha-response' => 'required|captcha', ]); diff --git a/flexiapi/app/Http/Controllers/Api/AccountPhoneController.php b/flexiapi/app/Http/Controllers/Api/AccountPhoneController.php index d046fc5..961d82c 100644 --- a/flexiapi/app/Http/Controllers/Api/AccountPhoneController.php +++ b/flexiapi/app/Http/Controllers/Api/AccountPhoneController.php @@ -37,7 +37,7 @@ class AccountPhoneController extends Controller 'phone' => [ 'required', 'unique:external.aliases,alias', 'unique:external.accounts,username', - new WithoutSpaces, 'starts_with:+', 'phone:AUTO' + new WithoutSpaces, 'starts_with:+' ] ]); diff --git a/flexiapi/app/Http/Controllers/Api/Admin/AccountController.php b/flexiapi/app/Http/Controllers/Api/Admin/AccountController.php index a6826e2..db90f12 100644 --- a/flexiapi/app/Http/Controllers/Api/Admin/AccountController.php +++ b/flexiapi/app/Http/Controllers/Api/Admin/AccountController.php @@ -91,7 +91,7 @@ class AccountController extends Controller 'phone' => [ 'unique:external.aliases,alias', 'unique:external.accounts,username', - new WithoutSpaces, 'starts_with:+', 'phone:AUTO' + new WithoutSpaces, 'starts_with:+' ] ]); diff --git a/flexiapi/composer.json b/flexiapi/composer.json index 1a5e069..9963d78 100644 --- a/flexiapi/composer.json +++ b/flexiapi/composer.json @@ -15,8 +15,7 @@ "laravel/tinker": "^2.4", "laravelcollective/html": "^6.2", "ovh/ovh": "^2.0", - "parsedown/laravel": "^1.2", - "propaganistas/laravel-phone": "^4.2" + "parsedown/laravel": "^1.2" }, "require-dev": { "facade/ignition": "^2.3", diff --git a/flexiapi/composer.lock b/flexiapi/composer.lock index 15ef5d5..58f8749 100644 --- a/flexiapi/composer.lock +++ b/flexiapi/composer.lock @@ -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": "f32d08746d9f85a865c21dc34baf5713", + "content-hash": "dba36fc99b2f9684b5127d8511ec640b", "packages": [ { "name": "anhskohbo/no-captcha", @@ -538,132 +538,6 @@ }, "time": "2020-10-22T13:48:01+00:00" }, - { - "name": "giggsey/libphonenumber-for-php", - "version": "8.12.22", - "source": { - "type": "git", - "url": "https://github.com/giggsey/libphonenumber-for-php.git", - "reference": "dc9992c35e52235c36241ebb5ddc280ceebe3c09" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/dc9992c35e52235c36241ebb5ddc280ceebe3c09", - "reference": "dc9992c35e52235c36241ebb5ddc280ceebe3c09", - "shasum": "" - }, - "require": { - "giggsey/locale": "^1.7", - "php": ">=5.3.2", - "symfony/polyfill-mbstring": "^1.17" - }, - "require-dev": { - "pear/pear-core-minimal": "^1.9", - "pear/pear_exception": "^1.0", - "pear/versioncontrol_git": "^0.5", - "phing/phing": "^2.7", - "php-coveralls/php-coveralls": "^1.0|^2.0", - "symfony/console": "^2.8|^3.0|^v4.4|^v5.2", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "8.x-dev" - } - }, - "autoload": { - "psr-4": { - "libphonenumber\\": "src/" - }, - "exclude-from-classmap": [ - "/src/data/", - "/src/carrier/data/", - "/src/geocoding/data/", - "/src/timezone/data/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Joshua Gigg", - "email": "giggsey@gmail.com", - "homepage": "https://giggsey.com/" - } - ], - "description": "PHP Port of Google's libphonenumber", - "homepage": "https://github.com/giggsey/libphonenumber-for-php", - "keywords": [ - "geocoding", - "geolocation", - "libphonenumber", - "mobile", - "phonenumber", - "validation" - ], - "support": { - "irc": "irc://irc.appliedirc.com/lobby", - "issues": "https://github.com/giggsey/libphonenumber-for-php/issues", - "source": "https://github.com/giggsey/libphonenumber-for-php" - }, - "time": "2021-04-29T07:34:59+00:00" - }, - { - "name": "giggsey/locale", - "version": "1.9", - "source": { - "type": "git", - "url": "https://github.com/giggsey/Locale.git", - "reference": "b07f1eace8072ccc61445ad8fbd493ff9d783043" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/giggsey/Locale/zipball/b07f1eace8072ccc61445ad8fbd493ff9d783043", - "reference": "b07f1eace8072ccc61445ad8fbd493ff9d783043", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "pear/pear-core-minimal": "^1.9", - "pear/pear_exception": "^1.0", - "pear/versioncontrol_git": "^0.5", - "phing/phing": "~2.7", - "php-coveralls/php-coveralls": "^1.0|^2.0", - "phpunit/phpunit": "^4.8|^5.0", - "symfony/console": "^2.8|^3.0|^4.0", - "symfony/filesystem": "^2.8|^3.0|^4.0", - "symfony/finder": "^2.8|^3.0|^4.0", - "symfony/process": "^2.8|^3.0|^4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Giggsey\\Locale\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Joshua Gigg", - "email": "giggsey@gmail.com", - "homepage": "http://giggsey.com/" - } - ], - "description": "Locale functions required by libphonenumber-for-php", - "support": { - "issues": "https://github.com/giggsey/Locale/issues", - "source": "https://github.com/giggsey/Locale/tree/master" - }, - "time": "2020-07-07T11:16:24+00:00" - }, { "name": "graham-campbell/result-type", "version": "v1.0.1", @@ -1435,63 +1309,6 @@ ], "time": "2020-08-23T07:39:11+00:00" }, - { - "name": "league/iso3166", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/iso3166.git", - "reference": "9976d382f270ad3f3df8a68719beb7a7179ffa1e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/iso3166/zipball/9976d382f270ad3f3df8a68719beb7a7179ffa1e", - "reference": "9976d382f270ad3f3df8a68719beb7a7179ffa1e", - "shasum": "" - }, - "require": { - "php": "^7.3|^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "League\\ISO3166\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com" - } - ], - "description": "ISO 3166-1 PHP Library", - "homepage": "https://github.com/thephpleague/iso3166", - "keywords": [ - "3166", - "3166-1", - "ISO 3166", - "countries", - "iso", - "library" - ], - "support": { - "issues": "https://github.com/thephpleague/iso3166/issues", - "source": "https://github.com/thephpleague/iso3166" - }, - "time": "2020-12-05T06:50:42+00:00" - }, { "name": "league/mime-type-detection", "version": "1.7.0", @@ -2028,72 +1845,6 @@ ], "time": "2020-07-20T17:29:33+00:00" }, - { - "name": "propaganistas/laravel-phone", - "version": "4.3.0", - "source": { - "type": "git", - "url": "https://github.com/Propaganistas/Laravel-Phone.git", - "reference": "6953b54542f530c75ab8eb953b38cca4bfdc5d88" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Propaganistas/Laravel-Phone/zipball/6953b54542f530c75ab8eb953b38cca4bfdc5d88", - "reference": "6953b54542f530c75ab8eb953b38cca4bfdc5d88", - "shasum": "" - }, - "require": { - "giggsey/libphonenumber-for-php": "^7.0|^8.0", - "illuminate/contracts": "^8.9", - "illuminate/support": "^8.0", - "illuminate/validation": "^8.0", - "league/iso3166": "^2.0|^3.0", - "php": "^7.3|^8.0" - }, - "require-dev": { - "orchestra/testbench": "*", - "phpunit/phpunit": "*" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Propaganistas\\LaravelPhone\\PhoneServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Propaganistas\\LaravelPhone\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Propaganistas", - "email": "Propaganistas@users.noreply.github.com" - } - ], - "description": "Adds phone number functionality to Laravel and Lumen based on Google's libphonenumber API.", - "keywords": [ - "laravel", - "libphonenumber", - "lumen", - "phone", - "validation" - ], - "support": { - "issues": "https://github.com/Propaganistas/Laravel-Phone/issues", - "source": "https://github.com/Propaganistas/Laravel-Phone/tree/4.3.0" - }, - "time": "2021-02-11T17:06:47+00:00" - }, { "name": "psr/container", "version": "1.1.1", diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 6b5f50c..1b29214 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 65 +%define build_number 66 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager