Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet int…

…o PHRAS-3900-email-tls12
alchemy-fr · Oct 19, 2023 · 37ba13c · 37ba13c
2 parents e7979eb + fc3baaf
commit 37ba13c
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 30 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -325,7 +325,7 @@ CMD ["nginx", "-g", "daemon off;"]
 HEALTHCHECK CMD wget --spider http://127.0.0.1/login || nginx -s reload || exit 1
 
 #########################################################################
-# phrasaseanet adapted simplesaml service provider 
+# phraseanet adapted simplesaml service provider 
 #########################################################################
 
 FROM php:7.0-fpm-stretch as phraseanet-saml-sp
@@ -353,7 +353,7 @@ RUN echo "deb http://archive.debian.org/debian stretch main non-free" > /etc/apt
     && docker-php-ext-install -j$(nproc) ldap \
     && docker-php-ext-install zip mbstring pdo_mysql gettext mcrypt \
     && pecl install \
-        redis \
+        redis-5.3.7 \
     && docker-php-ext-enable redis \
     && pecl clear-cache \
     && docker-php-source delete

diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js
@@ -13,5 +13,5 @@ module.exports = {
     setupDir: _root + 'tests/setup/node.js',
     karmaConf: _root + 'config/karma.conf.js',
     // change this version when you change JS file for lazy loading
-    assetFileVersion: 94
+    assetFileVersion: 95
 };
diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=94";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=95";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=94";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=95";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=94";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=95";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js
@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=94";
+/******/ 		script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=95";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

diff --git a/Phraseanet-production-client/dist/lazy-1.js b/Phraseanet-production-client/dist/lazy-1.js
@@ -64036,7 +64036,6 @@ var rangeCapture = function rangeCapture(services, datas) {
         }
         options.frameRates = {};
         options.ratios = {};
-        var coverUrl = '';
         var generateSourcesTpl = function generateSourcesTpl(record) {
             var recordSources = [];
             _underscore2.default.each(record.sources, function (s, i) {
@@ -64049,7 +64048,7 @@ var rangeCapture = function rangeCapture(services, datas) {
         };
 
         var sources = generateSourcesTpl(record);
-        $container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n               preload="none" width="100%" height="100%" poster="' + coverUrl + '" data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');
+        $container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n               preload="none" width="100%" height="100%"  data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');
 
         // window.videojs = videojs;
         _video2.default.addLanguage(localeService.getLocale(), localeService.getTranslations());

diff --git a/Phraseanet-production-client/dist/lazy-1.min.js b/Phraseanet-production-client/dist/lazy-1.min.js
@@ -64036,7 +64036,6 @@ var rangeCapture = function rangeCapture(services, datas) {
         }
         options.frameRates = {};
         options.ratios = {};
-        var coverUrl = '';
         var generateSourcesTpl = function generateSourcesTpl(record) {
             var recordSources = [];
             _underscore2.default.each(record.sources, function (s, i) {
@@ -64049,7 +64048,7 @@ var rangeCapture = function rangeCapture(services, datas) {
         };
 
         var sources = generateSourcesTpl(record);
-        $container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n               preload="none" width="100%" height="100%" poster="' + coverUrl + '" data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');
+        $container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n               preload="none" width="100%" height="100%"  data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');
 
         // window.videojs = videojs;
         _video2.default.addLanguage(localeService.getLocale(), localeService.getTranslations());

diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js
@@ -63629,7 +63629,6 @@ var recordVideoEditorModal = function recordVideoEditorModal(services, datas) {
             openModal(datas, activeTab);
         });
     };
-    initialize();
 
     toolsStream.subscribe(function (params) {
         switch (params.action) {

diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js
@@ -63629,7 +63629,6 @@ var recordVideoEditorModal = function recordVideoEditorModal(services, datas) {
             openModal(datas, activeTab);
         });
     };
-    initialize();
 
     toolsStream.subscribe(function (params) {
         switch (params.action) {

diff --git a/Phraseanet-production-client/src/components/record/videoEditor/index.js b/Phraseanet-production-client/src/components/record/videoEditor/index.js
@@ -26,7 +26,6 @@ const recordVideoEditorModal = (services, datas, activeTab = false) => {
             openModal(datas, activeTab);
         });
     };
-    initialize();
 
     toolsStream.subscribe((params) => {
         switch (params.action) {

diff --git a/Phraseanet-production-client/src/components/videoEditor/rangeCapture.js b/Phraseanet-production-client/src/components/videoEditor/rangeCapture.js
@@ -35,7 +35,6 @@ const rangeCapture = (services, datas, activeTab = false) => {
         }
         options.frameRates = {};
         options.ratios = {};
-        const coverUrl = '';
         let generateSourcesTpl = (record) => {
             let recordSources = [];
             _.each(record.sources, (s, i) => {
@@ -50,7 +49,7 @@ const rangeCapture = (services, datas, activeTab = false) => {
         let sources = generateSourcesTpl(record);
         $container.append(
             `<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls
-               preload="none" width="100%" height="100%" poster="${coverUrl}" data-setup='{"language":"${localeService.getLocale()}"}'>${sources} </video>`);
+               preload="none" width="100%" height="100%"  data-setup='{"language":"${localeService.getLocale()}"}'>${sources} </video>`);
 
         // window.videojs = videojs;
         videojs.addLanguage(localeService.getLocale(), localeService.getTranslations());

diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
     "php": ">=7.0 <7.1",
     "ext-intl": "*",
     "alchemy-fr/tcpdf-clone": "~6.0",
-    "alchemy/embed-bundle": "^2.0.7",
+    "alchemy/embed-bundle": "^2.0.15",
     "alchemy/geonames-api-consumer": "~0.1.0",
     "alchemy/mediavorus": "^0.4.4",
     "alchemy/oauth2php": "1.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php
@@ -1355,7 +1355,7 @@ private function getAndSaveToken($exposeName)
                 $accessToken = $tokenInfo['access_token'];
             } elseif (is_array($tokenInfo) && $tokenInfo['expires_at'] > time()) {
                 $accessToken = $tokenInfo['access_token'];
-            } elseif (is_array($tokenInfo) && $tokenInfo['expires_at'] <= time() && $tokenInfo['refresh_expires_at'] > time()) {
+            } elseif (is_array($tokenInfo) && $tokenInfo['expires_at'] <= time() && isset($tokenInfo['refresh_expires_at']) && $tokenInfo['refresh_expires_at'] > time()) {
                 $resToken = $this->refreshToken($oauthClient, $config, $tokenInfo['refresh_token']);
 
                 if ($resToken->getStatusCode() !== 200) {

diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
@@ -62,7 +62,7 @@ public function getGlobals()
     {
         return [
             // change this version when you change JS file to force the navigation to reload js file
-            'assetFileVersion' => 94
+            'assetFileVersion' => 95
         ];
 
     }

diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php
@@ -225,6 +225,7 @@ public function process(array $payload)
                     'publication_id' => $payload['publicationId'],
                     'description'    => $description,
                     'asset_id'       => $assetId,
+                    'title'          => $record->get_title(),
                     'upload' => [
                         'type' => $record->get_subdef($phraseanetSubdefAsDocument)->get_mime(),
                         'size' => $record->get_subdef($phraseanetSubdefAsDocument)->get_size(),
@@ -472,9 +473,9 @@ private function getToken()
         if ($this->exposeConfiguration['connection_kind'] == 'password') {
             if (!isset($this->accessTokenInfo['expires_at'])) {
                 return $this->accessTokenInfo['access_token'];
-            } elseif ($this->accessTokenInfo['expires_at'] > time() && $this->accessTokenInfo['refresh_expires_at'] > time()) {
+            } elseif ($this->accessTokenInfo['expires_at'] > time()) {
                 return $this->accessTokenInfo['access_token'];
-            } elseif ($this->accessTokenInfo['expires_at'] <= time() && $this->accessTokenInfo['refresh_expires_at'] > time()) {
+            } elseif ($this->accessTokenInfo['expires_at'] <= time() && isset($tokenInfo['refresh_expires_at']) && $this->accessTokenInfo['refresh_expires_at'] > time()) {
                 $resToken = $oauthClient->post($this->exposeConfiguration['oauth_token_uri'], [
                     'form_params' => [
                         'client_id' => $this->exposeConfiguration['auth_client_id'],

diff --git a/templates/web/admin/phraseanet-service/expose.html.twig b/templates/web/admin/phraseanet-service/expose.html.twig
@@ -48,7 +48,7 @@
             {{ form_row(form.expose_client_id) }}
         </div>
 
-        <div class="control-group auth-field">
+        <div class="control-group">
             {{ form_label(form.oauth_token_uri) }}
             <div style="margin-top: 10px; margin-bottom: 10px;">
                 expose v2 : https://api-auth.phrasea.local/oauth/v2/token