hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-1648-user-password

Browse Source
This commit is contained in:
Nicolas Maillat
2020-03-03 17:19:37 +01:00
committed by GitHub
parent 8acd7576d0 6efbbc3661
commit b83e5500f0
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Alchemy/Phrasea/Command/User/UserApplicationsCommand.php
View File

@@ -246,6 +246,7 @@ class UserApplicationsCommand extends Command
$account->getUser()->getId(), $account->getUser()->getId(),
$application->getName(), $application->getName(),
$application->getClientId(), $application->getClientId(),
$application->getClientSecret(),
$application->getRedirectUri(), $application->getRedirectUri(),
($token) ? $token->getOauthToken() : '-', ($token) ? $token->getOauthToken() : '-',
$application->isPasswordGranted() ? "true": "false" $application->isPasswordGranted() ? "true": "false"
@@ -253,7 +254,7 @@ class UserApplicationsCommand extends Command
} }
$applicationTable = $this->getHelperSet()->get('table'); $applicationTable = $this->getHelperSet()->get('table');
$headers = ['app_id', 'user_id', 'name', 'client_id', 'callback_url', 'generated token', 'grant_password status']; $headers = ['app_id', 'user_id', 'name', 'client_id', 'client_secret', 'callback_url', 'generated token', 'grant_password status'];
if ($jsonformat ) { if ($jsonformat ) {
foreach ($applicationList as $appList) { foreach ($applicationList as $appList) {
@@ -312,7 +313,7 @@ class UserApplicationsCommand extends Command
$application->isPasswordGranted() ? "true": "false" $application->isPasswordGranted() ? "true": "false"
]; ];
$headers = ['client secret', 'client ID', 'Authorize endpoint url', 'Access endpoint', 'generated token', 'grant_password status']; $headers = ['client_secret', 'client_id', 'Authorize endpoint url', 'Access endpoint', 'generated token', 'grant_password status'];
if ($jsonformat ) { if ($jsonformat ) {
$createdAppInfo = array_combine($headers, $applicationCreated); $createdAppInfo = array_combine($headers, $applicationCreated);
echo json_encode($createdAppInfo); echo json_encode($createdAppInfo);

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.142-d", "phraseanet-production-client": "0.34.146-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.142-d: phraseanet-production-client@0.34.146-d:
version "0.34.142-d" version "0.34.146-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.142-d.tgz#9b66d9722e316c9af0ec35c9f497932b70c28c2e" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.146-d.tgz#39e5e61c38a0719d46a3805d8fe3d7a64b0d7c38"
integrity sha512-U4gholdgWgjas16yerS+XqfrTcAhOCMMwXSbj8sapCdHUxy1GnSSelKcx/OTp+IPU/0oWpjT0I6M27azxhA/Sw== integrity sha512-0Flp6UuNiSPTo1rF80NyHjjB7sgP0c13gwtfR8Mzx0Rp7s2NFzgJnh4LXwdhWy+/WCQYnXWuH4XTJuRjmT27RA==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"