diff --git a/flexiapi/app/AccountAction.php b/flexiapi/app/AccountAction.php index 314d805..3e70055 100644 --- a/flexiapi/app/AccountAction.php +++ b/flexiapi/app/AccountAction.php @@ -1,4 +1,21 @@ . +*/ namespace App; diff --git a/flexiapi/app/AccountTombstone.php b/flexiapi/app/AccountTombstone.php index 7854570..a7000ce 100644 --- a/flexiapi/app/AccountTombstone.php +++ b/flexiapi/app/AccountTombstone.php @@ -1,4 +1,21 @@ . +*/ namespace App; diff --git a/flexiapi/app/AccountType.php b/flexiapi/app/AccountType.php index 4d9cb82..f85408b 100644 --- a/flexiapi/app/AccountType.php +++ b/flexiapi/app/AccountType.php @@ -1,4 +1,21 @@ . +*/ namespace App; diff --git a/flexiapi/app/Console/Commands/ClearOldAccountsTombstones.php b/flexiapi/app/Console/Commands/ClearOldAccountsTombstones.php index 89f7392..75bc2ae 100644 --- a/flexiapi/app/Console/Commands/ClearOldAccountsTombstones.php +++ b/flexiapi/app/Console/Commands/ClearOldAccountsTombstones.php @@ -19,7 +19,6 @@ namespace App\Console\Commands; -use App\Account; use App\AccountTombstone; use Carbon\Carbon; use Illuminate\Console\Command; diff --git a/flexiapi/app/Console/Commands/ImportDatabase.php b/flexiapi/app/Console/Commands/ImportDatabase.php index 39683da..8cfd933 100644 --- a/flexiapi/app/Console/Commands/ImportDatabase.php +++ b/flexiapi/app/Console/Commands/ImportDatabase.php @@ -90,7 +90,6 @@ class ImportDatabase extends Command if ($this->confirm($accountsCount . ' accounts will be migrated : Do you wish to continue?')) { // Accounts - $this->info('Migrating the accounts'); $pages = $accountsCount / $this->_pagination; diff --git a/flexiapi/app/Contact.php b/flexiapi/app/Contact.php index 1909d25..8974924 100644 --- a/flexiapi/app/Contact.php +++ b/flexiapi/app/Contact.php @@ -1,4 +1,21 @@ . +*/ namespace App; diff --git a/flexiapi/app/Rules/NoUppercase.php b/flexiapi/app/Rules/NoUppercase.php index 057ceba..2e4b46a 100644 --- a/flexiapi/app/Rules/NoUppercase.php +++ b/flexiapi/app/Rules/NoUppercase.php @@ -1,4 +1,21 @@ . +*/ namespace App\Rules; diff --git a/flexiapi/public/css/style.css b/flexiapi/public/css/style.css index 947a89d..6632bbc 100644 --- a/flexiapi/public/css/style.css +++ b/flexiapi/public/css/style.css @@ -1,6 +1,6 @@ @font-face { font-family: "Montserrat"; - src: local("Montserrat Regular"), local("Montserrat-Regular"), url("https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2") format("woff2"); + src: local("Montserrat Regular"), local("Montserrat-Regular"), url("../fonts/Montserrat-Regular.woff2") format("woff2"); font-style: normal; font-weight: 400; unicode-range: U+0-FF, U+131, U+152-153, U+2BB-2BC, U+2C6, U+2DA, U+2DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; @@ -8,7 +8,7 @@ @font-face { font-family: "Montserrat"; - src: local("Montserrat Bold"), local("Montserrat-Bold"), url("https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gnD_g.woff2") format("woff2"); + src: local("Montserrat Bold"), local("Montserrat-Bold"), url("../fonts/Montserrat-Bold.woff2") format("woff2"); font-style: normal; font-weight: 700; unicode-range: U+0-FF, U+131, U+152-153, U+2BB-2BC, U+2C6, U+2DA, U+2DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; diff --git a/flexiapi/public/fonts/Montserrat-Bold.woff2 b/flexiapi/public/fonts/Montserrat-Bold.woff2 new file mode 100644 index 0000000..3d0b409 Binary files /dev/null and b/flexiapi/public/fonts/Montserrat-Bold.woff2 differ diff --git a/flexiapi/public/fonts/Montserrat-Regular.woff2 b/flexiapi/public/fonts/Montserrat-Regular.woff2 new file mode 100644 index 0000000..70788c2 Binary files /dev/null and b/flexiapi/public/fonts/Montserrat-Regular.woff2 differ diff --git a/flexiapi/resources/views/api/documentation_markdown.blade.php b/flexiapi/resources/views/api/documentation_markdown.blade.php index 51cd6f6..aa2ef36 100644 --- a/flexiapi/resources/views/api/documentation_markdown.blade.php +++ b/flexiapi/resources/views/api/documentation_markdown.blade.php @@ -1,6 +1,6 @@ -# About +# About & Auth. -An API to deal with the Flexisip server +An API to deal with the Flexisip server. The API is available under `/api` @@ -13,11 +13,12 @@ A `from` (consisting of the user SIP address, prefixed with `sip:`), `content-ty > accept: application/json ``` -# Authentication +
+
Restricted endpoints are protected using a DIGEST authentication or an API Key mechanisms. -## Access model +#### Access model The endpoints are accessible using three different models: @@ -25,7 +26,7 @@ The endpoints are accessible using three different models: - User the endpoint can only be accessed by an authenticated user - Admin the endpoint can be only be accessed by an authenticated admin user -## Using the API Key +#### Using the API Key You can retrieve an API Key from @if (config('app.web_panel')) [your account panel]({{ route('account.login') }}) @else your account panel @endif or using the dedicated API endpoint. @@ -47,7 +48,7 @@ Or using a cookie: > … ``` -## Using DIGEST +#### Using DIGEST To discover the available hashing algorythm you MUST send an unauthenticated request to one of the restricted endpoints.
For the moment only DIGEST-MD5 and DIGEST-SHA-256 are supported through the authentication layer. @@ -65,6 +66,9 @@ For the moment only DIGEST-MD5 and DIGEST-SHA-256 are supported through the auth You can find more documentation on the related [IETF RFC-7616](https://tools.ietf.org/html/rfc7616). +
+
+ # Endpoints ## Ping @@ -75,7 +79,7 @@ Returns `pong` ## Account Creation Tokens -An account creation token is a unique token that allow the creation of a unique account. +An account creation token is a unique token that allow the creation of a **unique** account. ### `POST /account_creation_tokens/send-by-push` Public diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index ddacd82..2581864 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 138 +%define build_number 139 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager