From 3f1b5b2319e878a37be4268cb5bff9350e4a79e3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:13:34 +0200 Subject: [PATCH 01/51] Add ChillWopiBundle. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b5af76421..456f4d333 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle", "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", - "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle" + "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", + "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src" } }, "autoload-dev": { From 364aff36a4d1b3c58ce83cc7f73f412c72007dc4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:13:46 +0200 Subject: [PATCH 02/51] Add initial set of files. --- src/Bundle/ChillWopiBundle/.editorconfig | 19 + src/Bundle/ChillWopiBundle/.gitignore | 11 + src/Bundle/ChillWopiBundle/LICENSE | 661 ++++++++++++++++++ src/Bundle/ChillWopiBundle/README.md | 3 + src/Bundle/ChillWopiBundle/composer.json | 28 + src/Bundle/ChillWopiBundle/grumphp.yml | 9 + src/Bundle/ChillWopiBundle/phpunit.xml.dist | 13 + src/Bundle/ChillWopiBundle/psalm.xml | 15 + .../ChillWopiBundle/src/ChillWopiBundle.php | 16 + .../ChillWopiExtension.php | 30 + .../src/DependencyInjection/Configuration.php | 56 ++ .../src/Resources/services.php | 31 + .../src/Service/OpenStack/Client.php | 10 + .../OpenStack/OpenStackClientInterface.php | 78 +++ .../src/Service/WOPI/OpenstackWopi.php | 348 +++++++++ 15 files changed, 1328 insertions(+) create mode 100644 src/Bundle/ChillWopiBundle/.editorconfig create mode 100644 src/Bundle/ChillWopiBundle/.gitignore create mode 100644 src/Bundle/ChillWopiBundle/LICENSE create mode 100644 src/Bundle/ChillWopiBundle/README.md create mode 100644 src/Bundle/ChillWopiBundle/composer.json create mode 100644 src/Bundle/ChillWopiBundle/grumphp.yml create mode 100644 src/Bundle/ChillWopiBundle/phpunit.xml.dist create mode 100644 src/Bundle/ChillWopiBundle/psalm.xml create mode 100644 src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php create mode 100644 src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php create mode 100644 src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/services.php create mode 100644 src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php create mode 100644 src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php create mode 100644 src/Bundle/ChillWopiBundle/src/Service/WOPI/OpenstackWopi.php diff --git a/src/Bundle/ChillWopiBundle/.editorconfig b/src/Bundle/ChillWopiBundle/.editorconfig new file mode 100644 index 000000000..d769b46a4 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/.editorconfig @@ -0,0 +1,19 @@ +; top-most EditorConfig file +root = true + +; Unix-style newlines +[*] +charset = utf-8 +end_of_line = LF +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{php,html,twig}] +indent_style = space +indent_size = 4 + +[*.md] +max_line_length = 80 + +[COMMIT_EDITMSG] +max_line_length = 0 diff --git a/src/Bundle/ChillWopiBundle/.gitignore b/src/Bundle/ChillWopiBundle/.gitignore new file mode 100644 index 000000000..f443cb81e --- /dev/null +++ b/src/Bundle/ChillWopiBundle/.gitignore @@ -0,0 +1,11 @@ +composer.lock +vendor/* +parameters.yml +*~ +*.DS_Store +*.sass-cache +Resources/node_modules/ +Tests/Fixtures/App/app/config/parameters.yml +/nbproject/private/ +Resources/test/Fixtures/App/bootstrap.php.cache + diff --git a/src/Bundle/ChillWopiBundle/LICENSE b/src/Bundle/ChillWopiBundle/LICENSE new file mode 100644 index 000000000..be3f7b28e --- /dev/null +++ b/src/Bundle/ChillWopiBundle/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/src/Bundle/ChillWopiBundle/README.md b/src/Bundle/ChillWopiBundle/README.md new file mode 100644 index 000000000..9e6ac0af1 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/README.md @@ -0,0 +1,3 @@ +# ChillWopiBundle + +Read documentation here : http://chill.readthedocs.org diff --git a/src/Bundle/ChillWopiBundle/composer.json b/src/Bundle/ChillWopiBundle/composer.json new file mode 100644 index 000000000..838fe58e4 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/composer.json @@ -0,0 +1,28 @@ +{ + "name": "chill-project/chill-wopi-bundle", + "type": "symfony-bundle", + "description": "TODO", + "keywords": [ + "chill", + "wopi" + ], + "homepage": "http://www.champs-libres.coop", + "license": "AGPL-3.0", + "authors": [ + { + "name": "Champs-Libres", + "email": "info@champs-libres.coop", + "homepage": "http://www.champs-libres.coop" + } + ], + "require": { + "php": ">= 7.4", + "champs-libres/wopi-bundle": "dev-master", + "php-opencloud/openstack": "^3.2.1" + }, + "autoload": { + "psr-4": { + "Chill\\WopiBundle\\": "src/" + } + } +} diff --git a/src/Bundle/ChillWopiBundle/grumphp.yml b/src/Bundle/ChillWopiBundle/grumphp.yml new file mode 100644 index 000000000..c6fe2e7f5 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/grumphp.yml @@ -0,0 +1,9 @@ +imports: + - { resource: vendor/drupol/php-conventions/config/php73/grumphp.yml } + +parameters: + tasks.license.holder: Champs-Libres + tasks.license.date_from: 2021 + tasks.license.name: AGPL-3.0 + extra_tasks: + phpunit: ~ diff --git a/src/Bundle/ChillWopiBundle/phpunit.xml.dist b/src/Bundle/ChillWopiBundle/phpunit.xml.dist new file mode 100644 index 000000000..d2b877c46 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/phpunit.xml.dist @@ -0,0 +1,13 @@ + + + + + src + + + + + src/Tests + + + diff --git a/src/Bundle/ChillWopiBundle/psalm.xml b/src/Bundle/ChillWopiBundle/psalm.xml new file mode 100644 index 000000000..30258a709 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/psalm.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php new file mode 100644 index 000000000..694503987 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php @@ -0,0 +1,16 @@ +setParameter( + 'chill_wopi', + $this->processConfiguration(new Configuration(), $configs) + ); + + $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources')); + $loader->load('services.php'); + } +} diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php new file mode 100644 index 000000000..31453e584 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php @@ -0,0 +1,56 @@ +getRootNode(); + + $rootNode + ->children() + ->arrayNode('openstack') + ->info("parameters to connect to the openstack swift repository") + ->children() + ->scalarNode('os_username') + ->defaultValue('%env(resolve:OS_USERNAME)%') + ->isRequired() + ->cannotBeEmpty() + ->end() + ->scalarNode('os_password') + ->defaultValue('%env(resolve:OS_PASSWORD)%') + ->isRequired() + ->cannotBeEmpty() + ->end() + ->scalarNode('os_tenant_id') + ->defaultValue('%env(resolve:OS_TENANT_ID)%') + ->isRequired() + ->cannotBeEmpty() + ->end() + ->scalarNode('os_region_name') + ->defaultValue('%env(resolve:OS_REGION_NAME)%') + ->isRequired() + ->cannotBeEmpty() + ->end() + ->scalarNode('os_auth_url') + ->defaultValue('%env(resolve:OS_AUTH_URL)%') + ->isRequired() + ->cannotBeEmpty() + ->end() + ->end(); + + return $treeBuilder; + } +} diff --git a/src/Bundle/ChillWopiBundle/src/Resources/services.php b/src/Bundle/ChillWopiBundle/src/Resources/services.php new file mode 100644 index 000000000..ba31f5d00 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Resources/services.php @@ -0,0 +1,31 @@ +services(); + + $services + ->defaults() + ->autowire() + ->autoconfigure(); + + $services + ->load('Chill\\WopiBundle\\', '../*') + ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); + + $services + ->set('chill_wopi.openstack_cient') + ->class(OpenStack::class) + ->args('%chill_wopi.openstack%') +}; diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php new file mode 100644 index 000000000..085e99d82 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php @@ -0,0 +1,10 @@ +kernel = $kernel; + $this->psr17 = $psr17; + $this->wopiDiscovery = $wopiDiscovery; + $this->fs = new Filesystem(); + $this->filesRepository = sprintf('%s/files', $this->kernel->getCacheDir()); + $this->fs->mkdir($this->filesRepository); + } + + public function checkFileInfo( + string $fileId, + ?string $accessToken, + RequestInterface $request + ): ResponseInterface { + $filepath = sprintf( + '%s/%s', + $this->filesRepository, + $fileId + ); + + if (!$this->fs->exists($filepath)) { + $this->fs->touch($filepath); + } + + $filepathInfo = pathinfo($filepath); + + if (false !== current($this->wopiDiscovery->discoverExtension($filepathInfo['extension']))) { + // TODO Exception. + } + + return $this + ->psr17 + ->createResponse() + ->withHeader('Content-Type', 'application/json') + ->withBody($this->psr17->createStream((string) json_encode( + [ + 'BaseFileName' => $filepathInfo['basename'], + 'OwnerId' => uniqid(), + 'Size' => filesize($filepath), + 'UserId' => uniqid(), + 'Version' => 'v' . uniqid(), + 'ReadOnly' => false, + 'UserCanWrite' => true, + 'UserCanNotWriteRelative' => false, + 'SupportsLocks' => true, + 'UserFriendlyName' => 'User Name ' . uniqid(), + 'UserExtraInfo' => [], + 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', filemtime($filepath)), + 'CloseButtonClosesWindow' => true, + 'EnableInsertRemoteImage' => true, + 'EnableShare' => true, + 'SupportsUpdate' => true, + 'SupportsRename' => true, + 'DisablePrint' => false, + 'DisableExport' => false, + 'DisableCopy' => false, + ] + ))); + } + + public function deleteFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface + { + return $this->getDebugResponse(__FUNCTION__, $request); + } + + public function enumerateAncestors( + string $fileId, + ?string $accessToken, + RequestInterface $request + ): ResponseInterface { + return $this->getDebugResponse(__FUNCTION__, $request); + } + + public function getFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface + { + $filepath = sprintf( + '%s/%s', + $this->filesRepository, + $fileId + ); + + return $this + ->psr17 + ->createResponse() + ->withHeader( + 'Content-Type', + 'application/octet-stream', + ) + ->withHeader( + 'Content-Disposition', + sprintf('attachment; filename=%s', basename($filepath)) + ) + ->withBody($this->psr17->createStreamFromFile($filepath)); + } + + public function getLock(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface + { + $lockFilepath = $this->getLockFilepath($fileId); + + $lock = ''; + + if ($this->fs->exists($lockFilepath)) { + $lockData = json_decode(file_get_contents($lockFilepath)); + $lock = $lockData->lock; + } + + return $this + ->psr17 + ->createResponse() + ->withHeader('X-WOPI-Lock', $lock); + } + + public function getShareUrl( + string $fileId, + ?string $accessToken, + RequestInterface $request + ): ResponseInterface { + $data = [ + 'ShareUrl' => 'TODO', + ]; + + return $this + ->psr17 + ->createResponse() + ->withHeader('Content-Type', 'application/json') + ->withBody($this->psr17->createStream((string) json_encode($data))); + } + + public function lock( + string $fileId, + ?string $accessToken, + string $xWopiLock, + RequestInterface $request + ): ResponseInterface { + $lockFilepath = $this->getLockFilepath($fileId); + + if ($this->fs->exists($lockFilepath)) { + $previousLockData = json_decode(file_get_contents($lockFilepath)); + + if ($previousLockData->lock !== $xWopiLock) { + return $this + ->psr17 + ->createResponse(409) + ->withAddedHeader('X-WOPI-Lock', $previousLockData->lock); + } + } + + $data = [ + 'lock' => $xWopiLock, + 'time' => microtime(), + ]; + + $this->fs->dumpFile($lockFilepath, json_encode($data)); + + return $this + ->psr17 + ->createResponse(); + } + + public function putFile( + string $fileId, + ?string $accessToken, + string $xWopiLock, + string $xWopiEditors, + RequestInterface $request + ): ResponseInterface { + $filepath = sprintf( + '%s/%s', + $this->filesRepository, + $fileId + ); + + $lockFilepath = $this->getLockFilepath($fileId); + + if ($this->fs->exists($lockFilepath)) { + $previousLockData = json_decode(file_get_contents($lockFilepath)); + + if ($previousLockData->lock !== $xWopiLock) { + return $this + ->psr17 + ->createResponse(409) + ->withAddedHeader('X-WOPI-Lock', $previousLockData->lock); + } + } + + $return = file_put_contents( + $filepath, + (string) $request->getBody() + ); + + if (false === $return) { + return $this + ->psr17 + ->createResponse(500); + } + + return $this + ->psr17 + ->createResponse() + ->withHeader('Content-Type', 'application/json') + ->withAddedHeader('X-WOPI-Lock', $xWopiLock) + ->withBody($this->psr17->createStream((string) json_encode([]))); + } + + public function putRelativeFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface + { + $filepath = sprintf( + '%s/%s', + $this->filesRepository, + $request->getHeaderLine('X-WOPI-SuggestedTarget') + ); + + $return = file_put_contents( + $filepath, + (string) $request->getBody() + ); + + if (false === $return) { + return $this + ->psr17 + ->createResponse(500); + } + + return $this + ->psr17 + ->createResponse(500); // Not supported yet. + } + + public function putUserInfo(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface + { + return $this->getDebugResponse(__FUNCTION__, $request); + } + + public function refreshLock( + string $fileId, + ?string $accessToken, + string $xWopiLock, + RequestInterface $request + ): ResponseInterface { + return $this->getDebugResponse(__FUNCTION__, $request); + } + + public function renameFile( + string $fileId, + ?string $accessToken, + string $xWopiLock, + string $xWopiRequestedName, + RequestInterface $request + ): ResponseInterface { + return $this->getDebugResponse(__FUNCTION__, $request); + } + + public function unlock( + string $fileId, + ?string $accessToken, + string $xWopiLock, + RequestInterface $request + ): ResponseInterface { + $lockFilepath = $this->getLockFilepath($fileId); + + if ($this->fs->exists($lockFilepath)) { + $previousLockData = json_decode(file_get_contents($lockFilepath)); + + if ($previousLockData->lock !== $xWopiLock) { + return $this + ->psr17 + ->createResponse(409) + ->withAddedHeader('X-WOPI-Lock', $previousLockData->lock); + } + } + + $this->fs->remove($lockFilepath); + + return $this + ->psr17 + ->createResponse() + ->withAddedHeader('X-WOPI-Lock', ''); + } + + public function unlockAndRelock( + string $fileId, + ?string $accessToken, + string $xWopiLock, + string $xWopiOldLock, + RequestInterface $request + ): ResponseInterface { + return $this->getDebugResponse(__FUNCTION__, $request); + } + + private function getDebugResponse(string $method, RequestInterface $request): ResponseInterface + { + $params = []; + parse_str($request->getUri()->getQuery(), $params); + + $data = (string) json_encode(array_merge( + ['method' => $method], + $params, + $request->getHeaders() + )); + + return $this + ->psr17 + ->createResponse() + ->withHeader('content', 'application/json') + ->withBody($this->psr17->createStream($data)); + } + + private function getLockFilepath(string $fileId): string + { + return sprintf( + '%s/%s.lock', + $this->filesRepository, + $fileId + ); + } +} From 28af73db195c255eae7cb26634a1b98a86f7f0d7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:14:47 +0200 Subject: [PATCH 03/51] Fix typo. --- src/Bundle/ChillWopiBundle/src/Resources/services.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/services.php b/src/Bundle/ChillWopiBundle/src/Resources/services.php index ba31f5d00..18a7b2c89 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/services.php @@ -25,7 +25,7 @@ return static function (ContainerConfigurator $container) { ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); $services - ->set('chill_wopi.openstack_cient') + ->set('chill_wopi.openstack_client') ->class(OpenStack::class) - ->args('%chill_wopi.openstack%') + ->args('%chill_wopi.openstack%'); }; From 5d5ad9e4f7f6511afbb88d6d21fe6e1dec6ae72d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:19:28 +0200 Subject: [PATCH 04/51] Fix OpenStack service. --- src/Bundle/ChillWopiBundle/src/Resources/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/services.php b/src/Bundle/ChillWopiBundle/src/Resources/services.php index 18a7b2c89..816ce4d9f 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/services.php @@ -27,5 +27,5 @@ return static function (ContainerConfigurator $container) { $services ->set('chill_wopi.openstack_client') ->class(OpenStack::class) - ->args('%chill_wopi.openstack%'); + ->arg('$options', '%chill_wopi.openstack%'); }; From d616e00660c95a0d9d6dfe6eb45b9c592afc5dc2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:31:25 +0200 Subject: [PATCH 05/51] Add test routes and controller. --- .../ChillWopiBundle/src/Controller/Test.php | 32 +++++++++++++++++++ .../src/Resources/config/routes/routes.php | 17 ++++++++++ .../src/Resources/config/services.php | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 src/Bundle/ChillWopiBundle/src/Controller/Test.php create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/config/services.php diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php new file mode 100644 index 000000000..c82054a7e --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -0,0 +1,32 @@ +client = $client; + + var_dump($client); + } + + public function __invoke() + { + dump($this->client); + + return new Response('fobar'); + } +} diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php new file mode 100644 index 000000000..4bf8dbf94 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php @@ -0,0 +1,17 @@ +add('testtest', '/test') + ->controller(Test::class); +}; diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php new file mode 100644 index 000000000..47d80f40d --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -0,0 +1,32 @@ +services(); + + $services + ->defaults() + ->autoconfigure(true) + ->autowire(true); + + $services + ->load('ChampsLibres\\WopiTestBundle\\Service\\', __DIR__ . '/../../Service'); + + $services + ->load('ChampsLibres\\WopiTestBundle\\Controller\\', __DIR__ . '/../../Controller') + ->tag('controller.service_arguments'); + + $services + ->alias(WopiInterface::class, Wopi::class); +}; From 1bd00535cedebc43f2df48a644d757c6cb7c1e32 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:38:50 +0200 Subject: [PATCH 06/51] Update services for controllers. --- src/Bundle/ChillWopiBundle/src/Resources/services.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/services.php b/src/Bundle/ChillWopiBundle/src/Resources/services.php index 816ce4d9f..2462f0990 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/services.php @@ -24,6 +24,10 @@ return static function (ContainerConfigurator $container) { ->load('Chill\\WopiBundle\\', '../*') ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); + $services + ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') + ->tag('controller.service_arguments'); + $services ->set('chill_wopi.openstack_client') ->class(OpenStack::class) From 3c888238c5cb8c1180d83f1dcb6963f4236e165d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:40:15 +0200 Subject: [PATCH 07/51] Fix services file. --- .../src/Resources/config/services.php | 19 +++++----- .../src/Resources/services.php | 35 ------------------- 2 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 src/Bundle/ChillWopiBundle/src/Resources/services.php diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 47d80f40d..2462f0990 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -9,24 +9,27 @@ declare(strict_types=1); namespace Symfony\Component\DependencyInjection\Loader\Configurator; -use ChampsLibres\WopiLib\WopiInterface; -use ChampsLibres\WopiTestBundle\Service\Wopi; +use OpenStack\OpenStack; return static function (ContainerConfigurator $container) { - $services = $container->services(); + $services = $container + ->services(); $services ->defaults() - ->autoconfigure(true) - ->autowire(true); + ->autowire() + ->autoconfigure(); $services - ->load('ChampsLibres\\WopiTestBundle\\Service\\', __DIR__ . '/../../Service'); + ->load('Chill\\WopiBundle\\', '../*') + ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); $services - ->load('ChampsLibres\\WopiTestBundle\\Controller\\', __DIR__ . '/../../Controller') + ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') ->tag('controller.service_arguments'); $services - ->alias(WopiInterface::class, Wopi::class); + ->set('chill_wopi.openstack_client') + ->class(OpenStack::class) + ->arg('$options', '%chill_wopi.openstack%'); }; diff --git a/src/Bundle/ChillWopiBundle/src/Resources/services.php b/src/Bundle/ChillWopiBundle/src/Resources/services.php deleted file mode 100644 index 2462f0990..000000000 --- a/src/Bundle/ChillWopiBundle/src/Resources/services.php +++ /dev/null @@ -1,35 +0,0 @@ -services(); - - $services - ->defaults() - ->autowire() - ->autoconfigure(); - - $services - ->load('Chill\\WopiBundle\\', '../*') - ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); - - $services - ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') - ->tag('controller.service_arguments'); - - $services - ->set('chill_wopi.openstack_client') - ->class(OpenStack::class) - ->arg('$options', '%chill_wopi.openstack%'); -}; From 24b675ce9775ed814eef5efb4d9e11bde99aba7c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:41:04 +0200 Subject: [PATCH 08/51] Fix path to services.php. --- .../src/DependencyInjection/ChillWopiExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php index b750a1626..3bc31f507 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php @@ -24,7 +24,7 @@ final class ChillWopiExtension extends Extension $this->processConfiguration(new Configuration(), $configs) ); - $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources')); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); $loader->load('services.php'); } } From c7aafc6730a7953d0319bb1360f8f74bf7926aaa Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:42:06 +0200 Subject: [PATCH 09/51] Update services.php --- src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 2462f0990..e84a76f2a 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -21,8 +21,7 @@ return static function (ContainerConfigurator $container) { ->autoconfigure(); $services - ->load('Chill\\WopiBundle\\', '../*') - ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}'); + ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service'); $services ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') From 61bb595bbac7f45bc546740a08f29eadc8875e4d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:44:21 +0200 Subject: [PATCH 10/51] Update Test controller. --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index c82054a7e..d0a45e9a0 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -10,22 +10,24 @@ declare(strict_types=1); namespace Chill\WopiBundle\Controller; use Chill\WopiBundle\Service\OpenStack\OpenStackClientInterface; +use OpenStack\OpenStack; use Symfony\Component\HttpFoundation\Response; final class Test { private OpenStackClientInterface $client; - public function __construct(OpenStackClientInterface $client) + private OpenStack $osClient; + + public function __construct(OpenStackClientInterface $client, OpenStack $osClient) { $this->client = $client; - - var_dump($client); + $this->osClient = $osClient; } public function __invoke() { - dump($this->client); + dump($this->osClient); return new Response('fobar'); } From ebb679dbbbe00428569e0cb66413566eb9649e08 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:46:00 +0200 Subject: [PATCH 11/51] Update services.php. --- src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index e84a76f2a..a238adfef 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -28,7 +28,6 @@ return static function (ContainerConfigurator $container) { ->tag('controller.service_arguments'); $services - ->set('chill_wopi.openstack_client') - ->class(OpenStack::class) + ->set(OpenStack::class) ->arg('$options', '%chill_wopi.openstack%'); }; From b2d84a767789944b293b4216b5524772da99bcfc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:49:07 +0200 Subject: [PATCH 12/51] Update. --- .../src/DependencyInjection/ChillWopiExtension.php | 8 ++++++++ .../ChillWopiBundle/src/Resources/config/services.php | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php index 3bc31f507..4a8863322 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php @@ -18,12 +18,20 @@ final class ChillWopiExtension extends Extension { public function load(array $configs, ContainerBuilder $container) { + $config = $this->processConfiguration(new Configuration(), $configs); + $container ->setParameter( 'chill_wopi', $this->processConfiguration(new Configuration(), $configs) ); + $container + ->setParameter( + 'chill_wopi.openstack_client', + $config['openstack'] + ); + $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); $loader->load('services.php'); } diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index a238adfef..58286d66c 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -21,13 +21,14 @@ return static function (ContainerConfigurator $container) { ->autoconfigure(); $services - ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service'); + ->load('ChampsLibres\\WopiTestBundle\\Service\\', __DIR__ . '/../../Service'); $services ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') ->tag('controller.service_arguments'); $services - ->set(OpenStack::class) - ->arg('$options', '%chill_wopi.openstack%'); + ->set('chill_wopi.openstack_client') + ->class(OpenStack::class) + ->arg('$options', '%chill_wopi.openstack_client%'); }; From 12e17fac8269aff2a8524ee082d2382f13552fb9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:49:31 +0200 Subject: [PATCH 13/51] debug --- .../src/DependencyInjection/ChillWopiExtension.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php index 4a8863322..bb6171056 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php @@ -26,6 +26,10 @@ final class ChillWopiExtension extends Extension $this->processConfiguration(new Configuration(), $configs) ); + + var_dump($config); + + $container ->setParameter( 'chill_wopi.openstack_client', From df544bdfa47230a41b34b8a55c5f5ef15a9c4c53 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 10 Aug 2021 15:53:12 +0200 Subject: [PATCH 14/51] update --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 8 ++------ .../src/DependencyInjection/ChillWopiExtension.php | 12 +----------- .../src/Resources/config/services.php | 7 +------ .../ChillWopiBundle/src/Service/OpenStack/Client.php | 10 ++++++++++ .../Service/OpenStack/OpenStackClientInterface.php | 2 ++ 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index d0a45e9a0..ed7cf9c00 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -10,24 +10,20 @@ declare(strict_types=1); namespace Chill\WopiBundle\Controller; use Chill\WopiBundle\Service\OpenStack\OpenStackClientInterface; -use OpenStack\OpenStack; use Symfony\Component\HttpFoundation\Response; final class Test { private OpenStackClientInterface $client; - private OpenStack $osClient; - - public function __construct(OpenStackClientInterface $client, OpenStack $osClient) + public function __construct(OpenStackClientInterface $client) { $this->client = $client; - $this->osClient = $osClient; } public function __invoke() { - dump($this->osClient); + dump($this->client); return new Response('fobar'); } diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php index bb6171056..d67a62d94 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php @@ -23,17 +23,7 @@ final class ChillWopiExtension extends Extension $container ->setParameter( 'chill_wopi', - $this->processConfiguration(new Configuration(), $configs) - ); - - - var_dump($config); - - - $container - ->setParameter( - 'chill_wopi.openstack_client', - $config['openstack'] + $config ); $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 58286d66c..98cd4f002 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -21,14 +21,9 @@ return static function (ContainerConfigurator $container) { ->autoconfigure(); $services - ->load('ChampsLibres\\WopiTestBundle\\Service\\', __DIR__ . '/../../Service'); + ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service'); $services ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') ->tag('controller.service_arguments'); - - $services - ->set('chill_wopi.openstack_client') - ->class(OpenStack::class) - ->arg('$options', '%chill_wopi.openstack_client%'); }; diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php index 085e99d82..29cda11dd 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php +++ b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php @@ -1,10 +1,20 @@ get('chill_wopi'); + + parent::__construct($configuration['openstack']); + } } diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php index d8b2cfaee..3662b76eb 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php +++ b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php @@ -1,5 +1,7 @@ Date: Tue, 10 Aug 2021 16:08:40 +0200 Subject: [PATCH 15/51] Update configuration. --- .../src/DependencyInjection/Configuration.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php index 31453e584..8a35e8871 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php @@ -24,27 +24,27 @@ final class Configuration implements ConfigurationInterface ->arrayNode('openstack') ->info("parameters to connect to the openstack swift repository") ->children() - ->scalarNode('os_username') + ->scalarNode('username') ->defaultValue('%env(resolve:OS_USERNAME)%') ->isRequired() ->cannotBeEmpty() ->end() - ->scalarNode('os_password') + ->scalarNode('password') ->defaultValue('%env(resolve:OS_PASSWORD)%') ->isRequired() ->cannotBeEmpty() ->end() - ->scalarNode('os_tenant_id') + ->scalarNode('tenantId') ->defaultValue('%env(resolve:OS_TENANT_ID)%') ->isRequired() ->cannotBeEmpty() ->end() - ->scalarNode('os_region_name') + ->scalarNode('region') ->defaultValue('%env(resolve:OS_REGION_NAME)%') ->isRequired() ->cannotBeEmpty() ->end() - ->scalarNode('os_auth_url') + ->scalarNode('authUrl') ->defaultValue('%env(resolve:OS_AUTH_URL)%') ->isRequired() ->cannotBeEmpty() From c6b6fa5bf61d83b506fc4d8d93dccb8d50482a4f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 14:32:48 +0200 Subject: [PATCH 16/51] refactor: Update ChillDocStoreBundle - Add StoredObject repository. --- .../Entity/StoredObject.php | 48 ++++++++--------- .../Repository/StoredObjectRepository.php | 51 +++++++++++++++++++ .../ChillDocStoreBundle/config/services.yaml | 6 +++ 3 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index e145ff1ab..2b5345260 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -1,7 +1,7 @@ - * + * * @ORM\Entity() * @ORM\Table("chill_doc.stored_object") * @AsyncFileExists( @@ -27,51 +27,49 @@ class StoredObject implements AsyncFileInterface * @ORM\Column(type="integer") */ private $id; - + /** * @ORM\Column(type="text") */ private $filename; - + /** * @ORM\Column(type="json_array", name="key") * @var array */ private $keyInfos = array(); - + /** * - * @var int[] + * @var int[] * @ORM\Column(type="json_array", name="iv") */ private $iv = array(); - + /** * * @var \DateTime * @ORM\Column(type="datetime", name="creation_date") */ private $creationDate; - + /** - * - * @var string * @ORM\Column(type="text", name="type") */ - private $type = ''; - + private string $type = ''; + /** * * @var array * @ORM\Column(type="json_array", name="datas") */ private $datas = []; - + public function __construct() { $this->creationDate = new \DateTime(); } - + public function getId() { return $this->id; @@ -100,35 +98,39 @@ class StoredObject implements AsyncFileInterface public function setFilename($filename) { $this->filename = $filename; - + return $this; } public function setCreationDate(\DateTime $creationDate) { $this->creationDate = $creationDate; + return $this; } public function setType($type) { $this->type = $type; - + return $this; } public function setDatas(array $datas) { $this->datas = $datas; - + return $this; } + /** + * @deprecated Use method "getFilename()". + */ public function getObjectName() { return $this->getFilename(); } - + public function getKeyInfos() { return $this->keyInfos; @@ -142,14 +144,14 @@ class StoredObject implements AsyncFileInterface public function setKeyInfos($keyInfos) { $this->keyInfos = $keyInfos; - + return $this; } public function setIv($iv) { $this->iv = $iv; - + return $this; } diff --git a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php new file mode 100644 index 000000000..4da7b4ca9 --- /dev/null +++ b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php @@ -0,0 +1,51 @@ +repository = $entityManager->getRepository(StoredObject::class); + } + + /** + * @return array + */ + public function findAll(): array + { + return $this->repository->findAll(); + } + + /** + * @return array + */ + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function findOneBy(array $criteria): ?StoredObject + { + return $this->repository->findOneBy($criteria); + } + + public function getClassName(): string + { + return StoredObject::class; + } + + public function find($id, $lockMode = null, $lockVersion = null): ?StoredObject + { + return $this->repository->find($id, $lockMode, $lockVersion); + } +} diff --git a/src/Bundle/ChillDocStoreBundle/config/services.yaml b/src/Bundle/ChillDocStoreBundle/config/services.yaml index 79aa64ffa..812edab06 100644 --- a/src/Bundle/ChillDocStoreBundle/config/services.yaml +++ b/src/Bundle/ChillDocStoreBundle/config/services.yaml @@ -2,6 +2,12 @@ parameters: # cl_chill_person.example.class: Chill\PersonBundle\Example services: + Chill\DocStoreBundle\Repository\: + autowire: true + autoconfigure: true + resource: '../Repository/' + tags: ['doctrine.repository_service'] + Chill\DocStoreBundle\Form\DocumentCategoryType: class: Chill\DocStoreBundle\Form\DocumentCategoryType arguments: ['%kernel.bundles%'] From 1bd01aefae7d8b9c6732a91acb2ca11ba4801a1f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 14:33:28 +0200 Subject: [PATCH 17/51] refactor: Update ChillWopiBundle - Work in progress. --- .../src/Resources/config/services.php | 2 - .../src/Service/OpenStack/Client.php | 1 + .../OpenstackWopi.php => Wopi/ChillWopi.php} | 108 ++++++++---------- 3 files changed, 46 insertions(+), 65 deletions(-) rename src/Bundle/ChillWopiBundle/src/Service/{WOPI/OpenstackWopi.php => Wopi/ChillWopi.php} (77%) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 98cd4f002..11dd44233 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -9,8 +9,6 @@ declare(strict_types=1); namespace Symfony\Component\DependencyInjection\Loader\Configurator; -use OpenStack\OpenStack; - return static function (ContainerConfigurator $container) { $services = $container ->services(); diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php index 29cda11dd..faf612bfb 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php +++ b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php @@ -7,6 +7,7 @@ namespace Chill\WopiBundle\Service\OpenStack; use OpenStack\OpenStack; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; +// TODO: Remove extends - Ugly. final class Client extends OpenStack implements OpenStackClientInterface { private ParameterBagInterface $parameterBag; diff --git a/src/Bundle/ChillWopiBundle/src/Service/WOPI/OpenstackWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php similarity index 77% rename from src/Bundle/ChillWopiBundle/src/Service/WOPI/OpenstackWopi.php rename to src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 852882f3a..938f62577 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/WOPI/OpenstackWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -7,36 +7,42 @@ declare(strict_types=1); -namespace Chill\WopiBundle\Service; +namespace Chill\WopiBundle\Service\Wopi; +use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; use ChampsLibres\WopiLib\Discovery\WopiDiscoveryInterface; use ChampsLibres\WopiLib\WopiInterface; +use Chill\DocStoreBundle\Repository\StoredObjectRepository; +use Exception; use loophp\psr17\Psr17Interface; +use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; -use Symfony\Component\Filesystem\Filesystem; -use Symfony\Component\HttpKernel\KernelInterface; -final class OpenstackWopi implements WopiInterface +final class ChillWopi implements WopiInterface { - private string $filesRepository; - - private Filesystem $fs; - - private KernelInterface $kernel; - private Psr17Interface $psr17; private WopiDiscoveryInterface $wopiDiscovery; - public function __construct(Psr17Interface $psr17, KernelInterface $kernel, WopiDiscoveryInterface $wopiDiscovery) - { - $this->kernel = $kernel; + private StoredObjectRepository $storedObjectRepository; + + private ClientInterface $httpClient; + + private TempUrlGeneratorInterface $tempUrlGeneratorInterface; + + public function __construct( + Psr17Interface $psr17, + WopiDiscoveryInterface $wopiDiscovery, + StoredObjectRepository $storedObjectRepository, + ClientInterface $httpClient, + TempUrlGeneratorInterface $tempUrlGeneratorInterface + ) { $this->psr17 = $psr17; $this->wopiDiscovery = $wopiDiscovery; - $this->fs = new Filesystem(); - $this->filesRepository = sprintf('%s/files', $this->kernel->getCacheDir()); - $this->fs->mkdir($this->filesRepository); + $this->storedObjectRepository = $storedObjectRepository; + $this->httpClient = $httpClient; + $this->tempUrlGeneratorInterface = $tempUrlGeneratorInterface; } public function checkFileInfo( @@ -44,19 +50,10 @@ final class OpenstackWopi implements WopiInterface ?string $accessToken, RequestInterface $request ): ResponseInterface { - $filepath = sprintf( - '%s/%s', - $this->filesRepository, - $fileId - ); + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); + $mimeType = $storedObject->getType(); - if (!$this->fs->exists($filepath)) { - $this->fs->touch($filepath); - } - - $filepathInfo = pathinfo($filepath); - - if (false !== current($this->wopiDiscovery->discoverExtension($filepathInfo['extension']))) { + if (false !== current($this->wopiDiscovery->discoverMimeType($mimeType))) { // TODO Exception. } @@ -66,9 +63,9 @@ final class OpenstackWopi implements WopiInterface ->withHeader('Content-Type', 'application/json') ->withBody($this->psr17->createStream((string) json_encode( [ - 'BaseFileName' => $filepathInfo['basename'], + 'BaseFileName' => $storedObject->getFilename(), 'OwnerId' => uniqid(), - 'Size' => filesize($filepath), + 'Size' => 0, 'UserId' => uniqid(), 'Version' => 'v' . uniqid(), 'ReadOnly' => false, @@ -77,7 +74,7 @@ final class OpenstackWopi implements WopiInterface 'SupportsLocks' => true, 'UserFriendlyName' => 'User Name ' . uniqid(), 'UserExtraInfo' => [], - 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', filemtime($filepath)), + 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()), 'CloseButtonClosesWindow' => true, 'EnableInsertRemoteImage' => true, 'EnableShare' => true, @@ -105,11 +102,13 @@ final class OpenstackWopi implements WopiInterface public function getFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface { - $filepath = sprintf( - '%s/%s', - $this->filesRepository, - $fileId - ); + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); + + // TODO: Add strict typing in champs-libres/async-uploader-bundle + /** @var StdClass $object */ + $object = $this->tempUrlGeneratorInterface->generate('GET', $storedObject->getFilename()); + + $response = $this->httpClient->sendRequest($this->psr17->createRequest('GET', $object->url)); return $this ->psr17 @@ -120,9 +119,9 @@ final class OpenstackWopi implements WopiInterface ) ->withHeader( 'Content-Disposition', - sprintf('attachment; filename=%s', basename($filepath)) + sprintf('attachment; filename=%s', $storedObject->getFilename()) ) - ->withBody($this->psr17->createStreamFromFile($filepath)); + ->withBody($response->getBody()); } public function getLock(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface @@ -196,34 +195,17 @@ final class OpenstackWopi implements WopiInterface string $xWopiEditors, RequestInterface $request ): ResponseInterface { - $filepath = sprintf( - '%s/%s', - $this->filesRepository, - $fileId - ); + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); - $lockFilepath = $this->getLockFilepath($fileId); + // TODO: Add strict typing in champs-libres/async-uploader-bundle + /** @var StdClass $object */ + $object = $this->tempUrlGeneratorInterface->generate('PUT', $storedObject->getFilename()); - if ($this->fs->exists($lockFilepath)) { - $previousLockData = json_decode(file_get_contents($lockFilepath)); + $response = $this->httpClient->sendRequest($this->psr17->createRequest('PUT', $object->url)->withBody($request->getBody())); - if ($previousLockData->lock !== $xWopiLock) { - return $this - ->psr17 - ->createResponse(409) - ->withAddedHeader('X-WOPI-Lock', $previousLockData->lock); - } - } - - $return = file_put_contents( - $filepath, - (string) $request->getBody() - ); - - if (false === $return) { - return $this - ->psr17 - ->createResponse(500); + if (200 !== $response->getStatusCode()) + { + throw new Exception('Error in response.'); } return $this From 47a2af6f19a941e1fec8ef89251d5419a06d39f8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 15:20:48 +0200 Subject: [PATCH 18/51] Update composer.json. --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 456f4d333..950ecaec8 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,11 @@ "App\\": "tests/app/src/" } }, + "minimum-stability": "dev", + "prefer-stable": true, "require": { "champs-libres/async-uploader-bundle": "dev-sf4", + "champs-libres/wopi-bundle": "dev-master", "graylog2/gelf-php": "^1.5", "symfony/form": "4.*", "symfony/twig-bundle": "^4.4", From 72fc6e05ccf82ec517a7a50f769d1ae57f9b4740 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 15:37:14 +0200 Subject: [PATCH 19/51] refactor: Add WopiInterface wiring. --- .../ChillWopiBundle/src/Resources/config/services.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 11dd44233..8d5e4c5c9 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -9,6 +9,9 @@ declare(strict_types=1); namespace Symfony\Component\DependencyInjection\Loader\Configurator; +use ChampsLibres\WopiLib\WopiInterface; +use Chill\WopiBundle\Service\Wopi\ChillWopi; + return static function (ContainerConfigurator $container) { $services = $container ->services(); @@ -24,4 +27,7 @@ return static function (ContainerConfigurator $container) { $services ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') ->tag('controller.service_arguments'); + + $services + ->alias(WopiInterface::class, ChillWopi::class); }; From e4d9129af28c6ae68436f9692c9ab56029c36a24 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 15:39:40 +0200 Subject: [PATCH 20/51] refactor: Add TempUrlGeneratorInterface wiring. --- src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 8d5e4c5c9..0225ce070 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -9,6 +9,8 @@ declare(strict_types=1); namespace Symfony\Component\DependencyInjection\Loader\Configurator; +use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; +use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlOpenstackGenerator; use ChampsLibres\WopiLib\WopiInterface; use Chill\WopiBundle\Service\Wopi\ChillWopi; @@ -30,4 +32,7 @@ return static function (ContainerConfigurator $container) { $services ->alias(WopiInterface::class, ChillWopi::class); + + $services + ->alias(TempUrlGeneratorInterface::class, TempUrlOpenstackGenerator::class); }; From a41b959fbd36fec95b5559fabd192c5a504aeb49 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 15:45:48 +0200 Subject: [PATCH 21/51] refactor: Fix TempUrlGeneratorInterface wiring. --- src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 0225ce070..1f3490ce2 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -34,5 +34,5 @@ return static function (ContainerConfigurator $container) { ->alias(WopiInterface::class, ChillWopi::class); $services - ->alias(TempUrlGeneratorInterface::class, TempUrlOpenstackGenerator::class); + ->alias(TempUrlGeneratorInterface::class, 'async_uploader.temp_url_generator'); }; From 2b7fa630fc86c78bb57cd4c320674c4334df5c3d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 15:48:19 +0200 Subject: [PATCH 22/51] refactor: Add nyholm/psr7. --- composer.json | 1 + src/Bundle/ChillWopiBundle/composer.json | 1 + 2 files changed, 2 insertions(+) diff --git a/composer.json b/composer.json index 950ecaec8..cd61034b8 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,7 @@ "require": { "champs-libres/async-uploader-bundle": "dev-sf4", "champs-libres/wopi-bundle": "dev-master", + "nyholm/psr7": "^1.4", "graylog2/gelf-php": "^1.5", "symfony/form": "4.*", "symfony/twig-bundle": "^4.4", diff --git a/src/Bundle/ChillWopiBundle/composer.json b/src/Bundle/ChillWopiBundle/composer.json index 838fe58e4..7f7e6a4ed 100644 --- a/src/Bundle/ChillWopiBundle/composer.json +++ b/src/Bundle/ChillWopiBundle/composer.json @@ -18,6 +18,7 @@ "require": { "php": ">= 7.4", "champs-libres/wopi-bundle": "dev-master", + "nyholm/psr7": "^1.4", "php-opencloud/openstack": "^3.2.1" }, "autoload": { From 0366d0cb179c9eac6daf46ca0874079b9618c077 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 16:12:35 +0200 Subject: [PATCH 23/51] fix: Add exceptions. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 938f62577..d099732ef 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -51,10 +51,15 @@ final class ChillWopi implements WopiInterface RequestInterface $request ): ResponseInterface { $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); + + if (null === $storedObject) { + throw new Exception(sprintf('Unable to find object named %s', $fileId)); + } + $mimeType = $storedObject->getType(); if (false !== current($this->wopiDiscovery->discoverMimeType($mimeType))) { - // TODO Exception. + throw new Exception(sprintf('Unable to find mime type %s', $mimeType)); } return $this From c208797daf2a804439665e0d05351647783a5b63 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 16:19:19 +0200 Subject: [PATCH 24/51] fix: Update StoredObject entity. --- .../ChillDocStoreBundle/Entity/StoredObject.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index 2b5345260..538cab28b 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -7,6 +7,7 @@ namespace Chill\DocStoreBundle\Entity; use Doctrine\ORM\Mapping as ORM; use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface; use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists; +use DateTimeInterface; /** * Represent a document stored in an object store @@ -35,23 +36,20 @@ class StoredObject implements AsyncFileInterface /** * @ORM\Column(type="json_array", name="key") - * @var array */ - private $keyInfos = array(); + private array $keyInfos; /** * * @var int[] * @ORM\Column(type="json_array", name="iv") */ - private $iv = array(); + private array $iv; /** - * - * @var \DateTime * @ORM\Column(type="datetime", name="creation_date") */ - private $creationDate; + private DateTimeInterface $creationDate; /** * @ORM\Column(type="text", name="type") @@ -59,11 +57,9 @@ class StoredObject implements AsyncFileInterface private string $type = ''; /** - * - * @var array * @ORM\Column(type="json_array", name="datas") */ - private $datas = []; + private array $datas; public function __construct() { From a63c26482ee2ef26b31bc27263db896c5be3633c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:12:38 +0200 Subject: [PATCH 25/51] fix: Fix mimeType detection/discovery. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index d099732ef..053b9e97b 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -58,7 +58,7 @@ final class ChillWopi implements WopiInterface $mimeType = $storedObject->getType(); - if (false !== current($this->wopiDiscovery->discoverMimeType($mimeType))) { + if (false === reset($this->wopiDiscovery->discoverMimeType($mimeType))) { throw new Exception(sprintf('Unable to find mime type %s', $mimeType)); } From b1897263804ec0119bf879392fb088bf870b171e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:14:45 +0200 Subject: [PATCH 26/51] fix: Fix mimeType detection/discovery. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 053b9e97b..fc2e0c12a 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -58,7 +58,7 @@ final class ChillWopi implements WopiInterface $mimeType = $storedObject->getType(); - if (false === reset($this->wopiDiscovery->discoverMimeType($mimeType))) { + if ([] === $this->wopiDiscovery->discoverMimeType($mimeType)) { throw new Exception(sprintf('Unable to find mime type %s', $mimeType)); } From 62536ab2fff644bb10d90d5695184155825498a1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:16:00 +0200 Subject: [PATCH 27/51] fix: Format date properly. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index fc2e0c12a..54bfce885 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -79,7 +79,7 @@ final class ChillWopi implements WopiInterface 'SupportsLocks' => true, 'UserFriendlyName' => 'User Name ' . uniqid(), 'UserExtraInfo' => [], - 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()), + 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()->getTimestamp()), 'CloseButtonClosesWindow' => true, 'EnableInsertRemoteImage' => true, 'EnableShare' => true, From 8992b99d567f33527d5d13267ca3c8f60b4f7afc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:20:02 +0200 Subject: [PATCH 28/51] fix: Add user data. --- .../src/Service/Wopi/ChillWopi.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 54bfce885..713e1a197 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -18,6 +18,7 @@ use loophp\psr17\Psr17Interface; use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; +use Symfony\Component\Security\Core\Security; final class ChillWopi implements WopiInterface { @@ -31,18 +32,22 @@ final class ChillWopi implements WopiInterface private TempUrlGeneratorInterface $tempUrlGeneratorInterface; + private Security $security; + public function __construct( Psr17Interface $psr17, WopiDiscoveryInterface $wopiDiscovery, StoredObjectRepository $storedObjectRepository, ClientInterface $httpClient, - TempUrlGeneratorInterface $tempUrlGeneratorInterface + TempUrlGeneratorInterface $tempUrlGeneratorInterface, + Security $security ) { $this->psr17 = $psr17; $this->wopiDiscovery = $wopiDiscovery; $this->storedObjectRepository = $storedObjectRepository; $this->httpClient = $httpClient; $this->tempUrlGeneratorInterface = $tempUrlGeneratorInterface; + $this->security = $security; } public function checkFileInfo( @@ -69,15 +74,15 @@ final class ChillWopi implements WopiInterface ->withBody($this->psr17->createStream((string) json_encode( [ 'BaseFileName' => $storedObject->getFilename(), - 'OwnerId' => uniqid(), + 'OwnerId' => $this->security->getUser()->getUsername(), 'Size' => 0, - 'UserId' => uniqid(), - 'Version' => 'v' . uniqid(), + 'UserId' => $this->security->getUser()->getUsername(), +// 'Version' => 'v' . uniqid(), 'ReadOnly' => false, 'UserCanWrite' => true, 'UserCanNotWriteRelative' => false, 'SupportsLocks' => true, - 'UserFriendlyName' => 'User Name ' . uniqid(), + 'UserFriendlyName' => sprintf('User %s', $this->security->getUser()->getUsername()), 'UserExtraInfo' => [], 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()->getTimestamp()), 'CloseButtonClosesWindow' => true, From 4e04714a42ff8a71ed94cb141bf3c0dba260ba41 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:46:31 +0200 Subject: [PATCH 29/51] fix: Add wiring for UserProviderInterface. --- .../config/services/security.yaml | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml index e341eb196..4ecb09d8b 100644 --- a/src/Bundle/ChillMainBundle/config/services/security.yaml +++ b/src/Bundle/ChillMainBundle/config/services/security.yaml @@ -1,4 +1,8 @@ -services: +services: + _defaults: + autowire: true + autoconfigure: true + chill.main.security.authorization.helper: class: Chill\MainBundle\Security\Authorization\AuthorizationHelper arguments: @@ -6,47 +10,47 @@ services: $hierarchy: "%security.role_hierarchy.roles%" $em: '@Doctrine\ORM\EntityManagerInterface' Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper' - + chill.main.role_provider: class: Chill\MainBundle\Security\RoleProvider - + chill.main.user_provider: class: Chill\MainBundle\Security\UserProvider\UserProvider - arguments: - $em: '@Doctrine\ORM\EntityManagerInterface' - + + Symfony\Component\Security\Core\User\UserProviderInterface: chill.main.user_provider + Chill\MainBundle\Security\Authorization\ChillExportVoter: arguments: $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' tags: - { name: security.voter } - - Chill\MainBundle\Security\PasswordRecover\TokenManager: + + Chill\MainBundle\Security\PasswordRecover\TokenManager: arguments: $secret: '%kernel.secret%' $logger: '@Psr\Log\LoggerInterface' - + Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper: arguments: $tokenManager: '@Chill\MainBundle\Security\PasswordRecover\TokenManager' $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface' $mailer: '@Chill\MainBundle\Notification\Mailer' $routeParameters: "%chill_main.notifications%" - + Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEventSubscriber: arguments: $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker' tags: - { name: kernel.event_subscriber } - + Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker: arguments: $chillRedis: '@Chill\MainBundle\Redis\ChillRedis' $logger: '@Psr\Log\LoggerInterface' - + Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter: arguments: $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker' $requestStack: '@Symfony\Component\HttpFoundation\RequestStack' tags: - - { name: security.voter } \ No newline at end of file + - { name: security.voter } From 50f1d3cd10ba9c3936495853e7a2b6559a7d7622 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:46:49 +0200 Subject: [PATCH 30/51] fix: Add UserProviderInterface dependency. --- .../src/Service/Wopi/ChillWopi.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 713e1a197..4c45a2fe4 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -19,6 +19,7 @@ use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Symfony\Component\Security\Core\Security; +use Symfony\Component\Security\Core\User\UserProviderInterface; final class ChillWopi implements WopiInterface { @@ -34,13 +35,16 @@ final class ChillWopi implements WopiInterface private Security $security; + private UserProviderInterface $userProvider; + public function __construct( Psr17Interface $psr17, WopiDiscoveryInterface $wopiDiscovery, StoredObjectRepository $storedObjectRepository, ClientInterface $httpClient, TempUrlGeneratorInterface $tempUrlGeneratorInterface, - Security $security + Security $security, + UserProviderInterface $userProvider ) { $this->psr17 = $psr17; $this->wopiDiscovery = $wopiDiscovery; @@ -48,6 +52,7 @@ final class ChillWopi implements WopiInterface $this->httpClient = $httpClient; $this->tempUrlGeneratorInterface = $tempUrlGeneratorInterface; $this->security = $security; + $this->userProvider = $userProvider; } public function checkFileInfo( @@ -55,6 +60,8 @@ final class ChillWopi implements WopiInterface ?string $accessToken, RequestInterface $request ): ResponseInterface { + $user = $this->userProvider->loadUserByUsername($accessToken); + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); if (null === $storedObject) { @@ -74,15 +81,15 @@ final class ChillWopi implements WopiInterface ->withBody($this->psr17->createStream((string) json_encode( [ 'BaseFileName' => $storedObject->getFilename(), - 'OwnerId' => $this->security->getUser()->getUsername(), + 'OwnerId' => $user->getUsername(), 'Size' => 0, - 'UserId' => $this->security->getUser()->getUsername(), + 'UserId' => $user->getUsername(), // 'Version' => 'v' . uniqid(), 'ReadOnly' => false, 'UserCanWrite' => true, 'UserCanNotWriteRelative' => false, 'SupportsLocks' => true, - 'UserFriendlyName' => sprintf('User %s', $this->security->getUser()->getUsername()), + 'UserFriendlyName' => sprintf('User %s', $user->getUsername()), 'UserExtraInfo' => [], 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()->getTimestamp()), 'CloseButtonClosesWindow' => true, From 282539ae6ba24423f881952973909a731121460a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:48:02 +0200 Subject: [PATCH 31/51] fix: Add wiring for UserProviderInterface. --- src/Bundle/ChillMainBundle/config/services/security.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml index 4ecb09d8b..474ac0093 100644 --- a/src/Bundle/ChillMainBundle/config/services/security.yaml +++ b/src/Bundle/ChillMainBundle/config/services/security.yaml @@ -17,7 +17,7 @@ services: chill.main.user_provider: class: Chill\MainBundle\Security\UserProvider\UserProvider - Symfony\Component\Security\Core\User\UserProviderInterface: chill.main.user_provider + Symfony\Component\Security\Core\User\UserProviderInterface: "@chill.main.user_provider" Chill\MainBundle\Security\Authorization\ChillExportVoter: arguments: From c16fc77d01487f97bd49a7e0bea9c07b19c229e7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 17 Aug 2021 17:51:05 +0200 Subject: [PATCH 32/51] fix: Fix service naming, remove the suffix. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 4c45a2fe4..70f66ae27 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -31,7 +31,7 @@ final class ChillWopi implements WopiInterface private ClientInterface $httpClient; - private TempUrlGeneratorInterface $tempUrlGeneratorInterface; + private TempUrlGeneratorInterface $tempUrlGenerator; private Security $security; @@ -42,7 +42,7 @@ final class ChillWopi implements WopiInterface WopiDiscoveryInterface $wopiDiscovery, StoredObjectRepository $storedObjectRepository, ClientInterface $httpClient, - TempUrlGeneratorInterface $tempUrlGeneratorInterface, + TempUrlGeneratorInterface $tempUrlGenerator, Security $security, UserProviderInterface $userProvider ) { @@ -50,7 +50,7 @@ final class ChillWopi implements WopiInterface $this->wopiDiscovery = $wopiDiscovery; $this->storedObjectRepository = $storedObjectRepository; $this->httpClient = $httpClient; - $this->tempUrlGeneratorInterface = $tempUrlGeneratorInterface; + $this->tempUrlGenerator = $tempUrlGenerator; $this->security = $security; $this->userProvider = $userProvider; } From 494573e5b4122cdd93e9890599729ddbc85c00be Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 14:11:46 +0200 Subject: [PATCH 33/51] Remove obsolete controller. --- .../ChillWopiBundle/src/Controller/Test.php | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 src/Bundle/ChillWopiBundle/src/Controller/Test.php diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php deleted file mode 100644 index ed7cf9c00..000000000 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ /dev/null @@ -1,30 +0,0 @@ -client = $client; - } - - public function __invoke() - { - dump($this->client); - - return new Response('fobar'); - } -} From 84a460c4e7ebc2659c65369cde4dddfbdd53f458 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 14:12:14 +0200 Subject: [PATCH 34/51] Remove obsolete file. --- src/Bundle/ChillWopiBundle/phpunit.xml.dist | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/Bundle/ChillWopiBundle/phpunit.xml.dist diff --git a/src/Bundle/ChillWopiBundle/phpunit.xml.dist b/src/Bundle/ChillWopiBundle/phpunit.xml.dist deleted file mode 100644 index d2b877c46..000000000 --- a/src/Bundle/ChillWopiBundle/phpunit.xml.dist +++ /dev/null @@ -1,13 +0,0 @@ - - - - - src - - - - - src/Tests - - - From 4f39676e97f15e6bbd62b31b3837f2fa4b992d5f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 14:24:40 +0200 Subject: [PATCH 35/51] Remove obsolete OpenStack and Configuration stuff. --- .../src/DependencyInjection/Configuration.php | 32 -------- .../src/Resources/config/services.php | 1 - .../src/Service/OpenStack/Client.php | 21 ----- .../OpenStack/OpenStackClientInterface.php | 80 ------------------- 4 files changed, 134 deletions(-) delete mode 100644 src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php delete mode 100644 src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php index 8a35e8871..a30a203e4 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php @@ -19,38 +19,6 @@ final class Configuration implements ConfigurationInterface $treeBuilder = new TreeBuilder('chill_wopi'); $rootNode = $treeBuilder->getRootNode(); - $rootNode - ->children() - ->arrayNode('openstack') - ->info("parameters to connect to the openstack swift repository") - ->children() - ->scalarNode('username') - ->defaultValue('%env(resolve:OS_USERNAME)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('password') - ->defaultValue('%env(resolve:OS_PASSWORD)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('tenantId') - ->defaultValue('%env(resolve:OS_TENANT_ID)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('region') - ->defaultValue('%env(resolve:OS_REGION_NAME)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->scalarNode('authUrl') - ->defaultValue('%env(resolve:OS_AUTH_URL)%') - ->isRequired() - ->cannotBeEmpty() - ->end() - ->end(); - return $treeBuilder; } } diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 1f3490ce2..a40796607 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -10,7 +10,6 @@ declare(strict_types=1); namespace Symfony\Component\DependencyInjection\Loader\Configurator; use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; -use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlOpenstackGenerator; use ChampsLibres\WopiLib\WopiInterface; use Chill\WopiBundle\Service\Wopi\ChillWopi; diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php deleted file mode 100644 index faf612bfb..000000000 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/Client.php +++ /dev/null @@ -1,21 +0,0 @@ -get('chill_wopi'); - - parent::__construct($configuration['openstack']); - } -} diff --git a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php b/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php deleted file mode 100644 index 3662b76eb..000000000 --- a/src/Bundle/ChillWopiBundle/src/Service/OpenStack/OpenStackClientInterface.php +++ /dev/null @@ -1,80 +0,0 @@ - Date: Thu, 19 Aug 2021 16:03:19 +0200 Subject: [PATCH 36/51] fix: Update checkFileInfo, getFile and putFile. Remove obsolete code in unsupported methods. --- .../src/Service/Wopi/ChillWopi.php | 143 +++++++----------- 1 file changed, 53 insertions(+), 90 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index 70f66ae27..da8dde781 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -18,6 +18,7 @@ use loophp\psr17\Psr17Interface; use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; +use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserProviderInterface; @@ -60,7 +61,13 @@ final class ChillWopi implements WopiInterface ?string $accessToken, RequestInterface $request ): ResponseInterface { - $user = $this->userProvider->loadUserByUsername($accessToken); + try { + $user = $this->userProvider->loadUserByUsername($accessToken); + } catch (UsernameNotFoundException $e) { + return $this + ->psr17 + ->createResponse(401); + } $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); @@ -87,16 +94,16 @@ final class ChillWopi implements WopiInterface // 'Version' => 'v' . uniqid(), 'ReadOnly' => false, 'UserCanWrite' => true, - 'UserCanNotWriteRelative' => false, - 'SupportsLocks' => true, + 'UserCanNotWriteRelative' => true, + 'SupportsLocks' => false, 'UserFriendlyName' => sprintf('User %s', $user->getUsername()), 'UserExtraInfo' => [], 'LastModifiedTime' => date('Y-m-d\TH:i:s.u\Z', $storedObject->getCreationDate()->getTimestamp()), 'CloseButtonClosesWindow' => true, 'EnableInsertRemoteImage' => true, - 'EnableShare' => true, + 'EnableShare' => false, 'SupportsUpdate' => true, - 'SupportsRename' => true, + 'SupportsRename' => false, 'DisablePrint' => false, 'DisableExport' => false, 'DisableCopy' => false, @@ -119,14 +126,35 @@ final class ChillWopi implements WopiInterface public function getFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface { + try { + $user = $this->userProvider->loadUserByUsername($accessToken); + } catch (UsernameNotFoundException $e) { + return $this + ->psr17 + ->createResponse(401); + } + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); + if (null === $storedObject) { + return $this + ->psr17 + ->createResponse(404); + } + // TODO: Add strict typing in champs-libres/async-uploader-bundle /** @var StdClass $object */ $object = $this->tempUrlGeneratorInterface->generate('GET', $storedObject->getFilename()); $response = $this->httpClient->sendRequest($this->psr17->createRequest('GET', $object->url)); + if (200 !== $response->getStatusCode()) + { + return $this + ->psr17 + ->createResponse(500); + } + return $this ->psr17 ->createResponse() @@ -143,19 +171,7 @@ final class ChillWopi implements WopiInterface public function getLock(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface { - $lockFilepath = $this->getLockFilepath($fileId); - - $lock = ''; - - if ($this->fs->exists($lockFilepath)) { - $lockData = json_decode(file_get_contents($lockFilepath)); - $lock = $lockData->lock; - } - - return $this - ->psr17 - ->createResponse() - ->withHeader('X-WOPI-Lock', $lock); + return $this->getDebugResponse(__FUNCTION__, $request); } public function getShareUrl( @@ -163,15 +179,7 @@ final class ChillWopi implements WopiInterface ?string $accessToken, RequestInterface $request ): ResponseInterface { - $data = [ - 'ShareUrl' => 'TODO', - ]; - - return $this - ->psr17 - ->createResponse() - ->withHeader('Content-Type', 'application/json') - ->withBody($this->psr17->createStream((string) json_encode($data))); + return $this->getDebugResponse(__FUNCTION__, $request); } public function lock( @@ -180,29 +188,7 @@ final class ChillWopi implements WopiInterface string $xWopiLock, RequestInterface $request ): ResponseInterface { - $lockFilepath = $this->getLockFilepath($fileId); - - if ($this->fs->exists($lockFilepath)) { - $previousLockData = json_decode(file_get_contents($lockFilepath)); - - if ($previousLockData->lock !== $xWopiLock) { - return $this - ->psr17 - ->createResponse(409) - ->withAddedHeader('X-WOPI-Lock', $previousLockData->lock); - } - } - - $data = [ - 'lock' => $xWopiLock, - 'time' => microtime(), - ]; - - $this->fs->dumpFile($lockFilepath, json_encode($data)); - - return $this - ->psr17 - ->createResponse(); + return $this->getDebugResponse(__FUNCTION__, $request); } public function putFile( @@ -212,8 +198,20 @@ final class ChillWopi implements WopiInterface string $xWopiEditors, RequestInterface $request ): ResponseInterface { + try { + $user = $this->userProvider->loadUserByUsername($accessToken); + } catch (UsernameNotFoundException $e) { + return $this + ->psr17 + ->createResponse(401); + } + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); + if (null === $storedObject) { + throw new Exception(sprintf('Unable to find object named %s', $fileId)); + } + // TODO: Add strict typing in champs-libres/async-uploader-bundle /** @var StdClass $object */ $object = $this->tempUrlGeneratorInterface->generate('PUT', $storedObject->getFilename()); @@ -222,7 +220,9 @@ final class ChillWopi implements WopiInterface if (200 !== $response->getStatusCode()) { - throw new Exception('Error in response.'); + return $this + ->psr17 + ->createResponse(500); } return $this @@ -235,26 +235,7 @@ final class ChillWopi implements WopiInterface public function putRelativeFile(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface { - $filepath = sprintf( - '%s/%s', - $this->filesRepository, - $request->getHeaderLine('X-WOPI-SuggestedTarget') - ); - - $return = file_put_contents( - $filepath, - (string) $request->getBody() - ); - - if (false === $return) { - return $this - ->psr17 - ->createResponse(500); - } - - return $this - ->psr17 - ->createResponse(500); // Not supported yet. + return $this->getDebugResponse(__FUNCTION__, $request); } public function putUserInfo(string $fileId, ?string $accessToken, RequestInterface $request): ResponseInterface @@ -287,25 +268,7 @@ final class ChillWopi implements WopiInterface string $xWopiLock, RequestInterface $request ): ResponseInterface { - $lockFilepath = $this->getLockFilepath($fileId); - - if ($this->fs->exists($lockFilepath)) { - $previousLockData = json_decode(file_get_contents($lockFilepath)); - - if ($previousLockData->lock !== $xWopiLock) { - return $this - ->psr17 - ->createResponse(409) - ->withAddedHeader('X-WOPI-Lock', $previousLockData->lock); - } - } - - $this->fs->remove($lockFilepath); - - return $this - ->psr17 - ->createResponse() - ->withAddedHeader('X-WOPI-Lock', ''); + return $this->getDebugResponse(__FUNCTION__, $request); } public function unlockAndRelock( From 3599508a3be8a3190ac2acb9af0a207fd2ad3d83 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:04:43 +0200 Subject: [PATCH 37/51] fix: Fix services definitions. --- src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index a40796607..2a552e11e 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -25,10 +25,6 @@ return static function (ContainerConfigurator $container) { $services ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service'); - $services - ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') - ->tag('controller.service_arguments'); - $services ->alias(WopiInterface::class, ChillWopi::class); From 71900010f6880de3ce80978c99da039fb6b32780 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:06:05 +0200 Subject: [PATCH 38/51] fix: Fix property name. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index da8dde781..b8715eb47 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -144,7 +144,7 @@ final class ChillWopi implements WopiInterface // TODO: Add strict typing in champs-libres/async-uploader-bundle /** @var StdClass $object */ - $object = $this->tempUrlGeneratorInterface->generate('GET', $storedObject->getFilename()); + $object = $this->tempUrlGenerator->generate('GET', $storedObject->getFilename()); $response = $this->httpClient->sendRequest($this->psr17->createRequest('GET', $object->url)); From 60328032d8c6af525d0149eb178095d280a89e17 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:11:32 +0200 Subject: [PATCH 39/51] Revert "Remove obsolete controller." This reverts commit 494573e5b4122cdd93e9890599729ddbc85c00be. --- .../ChillWopiBundle/src/Controller/Test.php | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/Bundle/ChillWopiBundle/src/Controller/Test.php diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php new file mode 100644 index 000000000..ed7cf9c00 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -0,0 +1,30 @@ +client = $client; + } + + public function __invoke() + { + dump($this->client); + + return new Response('fobar'); + } +} From 0a183c8cfc897a8f613d0f00c2fd82822ab61e25 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:11:33 +0200 Subject: [PATCH 40/51] Revert "fix: Fix services definitions." This reverts commit 3599508a3be8a3190ac2acb9af0a207fd2ad3d83. --- src/Bundle/ChillWopiBundle/src/Resources/config/services.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php index 2a552e11e..a40796607 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php @@ -25,6 +25,10 @@ return static function (ContainerConfigurator $container) { $services ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service'); + $services + ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller') + ->tag('controller.service_arguments'); + $services ->alias(WopiInterface::class, ChillWopi::class); From 5a3fd2712c36ba11cae716b73ed92b2a3a210855 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:25:53 +0200 Subject: [PATCH 41/51] refactor: Add test controller. --- .../ChillWopiBundle/src/Controller/Test.php | 76 +++++++++++-- .../src/Resources/config/routes/routes.php | 2 +- .../src/Service/Controller/Responder.php | 101 ++++++++++++++++++ .../Service/Controller/ResponderInterface.php | 74 +++++++++++++ 4 files changed, 244 insertions(+), 9 deletions(-) create mode 100644 src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php create mode 100644 src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index ed7cf9c00..ebbe88002 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -9,22 +9,82 @@ declare(strict_types=1); namespace Chill\WopiBundle\Controller; -use Chill\WopiBundle\Service\OpenStack\OpenStackClientInterface; +use ChampsLibres\WopiLib\Configuration\WopiConfigurationInterface; +use ChampsLibres\WopiLib\Discovery\WopiDiscoveryInterface; +use Chill\DocStoreBundle\Repository\StoredObjectRepository; +use Chill\WopiBundle\Service\Controller\ResponderInterface; +use Exception; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Component\Security\Core\Security; final class Test { - private OpenStackClientInterface $client; + private StoredObjectRepository $storedObjectRepository; - public function __construct(OpenStackClientInterface $client) - { - $this->client = $client; + private WopiDiscoveryInterface $wopiDiscovery; + + private WopiConfigurationInterface $wopiConfiguration; + + private ResponderInterface $responder; + + private Security $security; + + public function __construct( + StoredObjectRepository $storedObjectRepository, + WopiConfigurationInterface $wopiConfiguration, + WopiDiscoveryInterface $wopiDiscovery, + ResponderInterface $responder, + Security $security + ) { + $this->storedObjectRepository = $storedObjectRepository; + $this->wopiConfiguration = $wopiConfiguration; + $this->wopiDiscovery = $wopiDiscovery; + $this->responder = $responder; + $this->security = $security; } - public function __invoke() + public function __invoke(string $fileId): Response { - dump($this->client); + $configuration = $this->wopiConfiguration->jsonSerialize(); + + $storedObject = $this->storedObjectRepository->findOneBy(['filename' => $fileId]); + + if (null === $storedObject) { + throw new Exception(sprintf('Unable to find object named %s', $fileId)); + } + + if ([] === $discoverExtension = $this->wopiDiscovery->discoverMimeType($storedObject->getType())) { + throw new Exception(sprintf('Unable to find mime type %s', $storedObject->getType())); + } + + $configuration['access_token'] = $this->security->getUser()->getUsername(); + + $configuration['server'] = $this + ->psr17 + ->createUri($discoverExtension[0]['urlsrc']) + ->withQuery( + http_build_query( + [ + 'WOPISrc' => $this + ->router + ->generate( + 'checkFileInfo', + [ + 'fileId' => $storedObject->getId(), + ], + UrlGeneratorInterface::ABSOLUTE_URL + ), + ] + ) + ); + + return $this + ->responder + ->render( + '@WopiBundle/Editor/page.html.twig', + $configuration + ); - return new Response('fobar'); } } diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php index 4bf8dbf94..e0f3447aa 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php @@ -12,6 +12,6 @@ use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; return static function (RoutingConfigurator $routes) { $routes - ->add('testtest', '/test') + ->add('testtest', '/edit/{fileId}') ->controller(Test::class); }; diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php new file mode 100644 index 000000000..bc26be62d --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php @@ -0,0 +1,101 @@ +twig = $twig; + $this->urlGenerator = $urlGenerator; + $this->serializer = $serializer; + } + + public function file( + $file, + ?string $filename = null, + string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT + ): BinaryFileResponse { + $response = new BinaryFileResponse($file); + + $filename ??= $response->getFile()->getFilename(); + $response->setContentDisposition($disposition, $filename); + + return $response; + } + + public function json( + $data, + int $status = 200, + array $headers = [], + array $context = [] + ): JsonResponse { + return new JsonResponse( + $this + ->serializer + ->serialize( + $data, + 'json', + array_merge( + [ + 'json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS, + ], + $context + ) + ), + $status, + $headers, + true + ); + } + + public function redirect(string $url, int $status = 302, array $headers = []): RedirectResponse + { + return new RedirectResponse($url, $status, $headers); + } + + public function redirectToRoute( + string $route, + array $parameters = [], + int $status = 302, + array $headers = [] + ): RedirectResponse { + return $this->redirect($this->urlGenerator->generate($route, $parameters), $status, $headers); + } + + public function render(string $template, array $context = [], int $status = 200, array $headers = []): Response + { + $response = new Response($this->twig->render($template, $context), $status, $headers); + + if (!$response->headers->has('Content-Type')) { + $response->headers->set('Content-Type', 'text/html; charset=UTF-8'); + } + + return $response; + } +} diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php new file mode 100644 index 000000000..712b3cd59 --- /dev/null +++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php @@ -0,0 +1,74 @@ +|string> $headers + * @param array $context + */ + public function json( + mixed $data, + int $status = 200, + array $headers = [], + array $context = [] + ): JsonResponse; + + /** + * Returns a RedirectResponse to the given URL. + * + * @param array|string> $headers + */ + public function redirect(string $url, int $status = 302, array $headers = []): RedirectResponse; + + /** + * Returns a RedirectResponse to the given route with the given parameters. + * + * @param array $parameters + * @param array> $headers + */ + public function redirectToRoute( + string $route, + array $parameters = [], + int $status = 302, + array $headers = [] + ): RedirectResponse; + + /** + * Render the given twig template and return an HTML response. + * + * @param array|string> $headers + * + * @throws TwigError + */ + public function render(string $template, array $context = [], int $status = 200, array $headers = []): Response; +} From bb9e1758499d8b63952f9ea129c8313fe9704118 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:27:41 +0200 Subject: [PATCH 42/51] Add missing psr17 service. --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index ebbe88002..ecba091e4 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -14,6 +14,7 @@ use ChampsLibres\WopiLib\Discovery\WopiDiscoveryInterface; use Chill\DocStoreBundle\Repository\StoredObjectRepository; use Chill\WopiBundle\Service\Controller\ResponderInterface; use Exception; +use loophp\psr17\Psr17Interface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Core\Security; @@ -30,18 +31,22 @@ final class Test private Security $security; + private Psr17Interface $psr17; + public function __construct( StoredObjectRepository $storedObjectRepository, WopiConfigurationInterface $wopiConfiguration, WopiDiscoveryInterface $wopiDiscovery, ResponderInterface $responder, - Security $security + Security $security, + Psr17Interface $psr17 ) { $this->storedObjectRepository = $storedObjectRepository; $this->wopiConfiguration = $wopiConfiguration; $this->wopiDiscovery = $wopiDiscovery; $this->responder = $responder; $this->security = $security; + $this->psr17 = $psr17; } public function __invoke(string $fileId): Response From 1d7ef9300cbf56caca420a20cc99bceed3058c35 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:28:36 +0200 Subject: [PATCH 43/51] Add missing router service. --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index ecba091e4..41fe4d2db 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -17,6 +17,7 @@ use Exception; use loophp\psr17\Psr17Interface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Security\Core\Security; final class Test @@ -33,13 +34,16 @@ final class Test private Psr17Interface $psr17; + private RouterInterface $router; + public function __construct( StoredObjectRepository $storedObjectRepository, WopiConfigurationInterface $wopiConfiguration, WopiDiscoveryInterface $wopiDiscovery, ResponderInterface $responder, Security $security, - Psr17Interface $psr17 + Psr17Interface $psr17, + RouterInterface $router ) { $this->storedObjectRepository = $storedObjectRepository; $this->wopiConfiguration = $wopiConfiguration; @@ -47,6 +51,7 @@ final class Test $this->responder = $responder; $this->security = $security; $this->psr17 = $psr17; + $this->router = $router; } public function __invoke(string $fileId): Response From fe4b9647b9e86ed4b28c8314a8e2a5a02b3e5868 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:29:14 +0200 Subject: [PATCH 44/51] fix path to twig template. --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index 41fe4d2db..b2904ae8d 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -92,7 +92,7 @@ final class Test return $this ->responder ->render( - '@WopiBundle/Editor/page.html.twig', + '@Wopi/Editor/page.html.twig', $configuration ); From da505ed10679f53ef34f4cc39281976bffd445ff Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:30:12 +0200 Subject: [PATCH 45/51] Add missing favicon url --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index b2904ae8d..9efe48dad 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -68,6 +68,7 @@ final class Test throw new Exception(sprintf('Unable to find mime type %s', $storedObject->getType())); } + $configuration['favIconUrl'] = ''; $configuration['access_token'] = $this->security->getUser()->getUsername(); $configuration['server'] = $this From 2a406456041a1c1eb602b06d248a73f702bb325a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:33:04 +0200 Subject: [PATCH 46/51] Pass the filename, not the id. --- src/Bundle/ChillWopiBundle/src/Controller/Test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php index 9efe48dad..db035c428 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php @@ -82,7 +82,7 @@ final class Test ->generate( 'checkFileInfo', [ - 'fileId' => $storedObject->getId(), + 'fileId' => $storedObject->getFilename(), ], UrlGeneratorInterface::ABSOLUTE_URL ), From 53cad329101b345947e4003984acf05ad1159193 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:49:55 +0200 Subject: [PATCH 47/51] Update checkFileInfo --- .../ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index b8715eb47..baf22529c 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -19,7 +19,6 @@ use Psr\Http\Client\ClientInterface; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; -use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\User\UserProviderInterface; final class ChillWopi implements WopiInterface @@ -34,8 +33,6 @@ final class ChillWopi implements WopiInterface private TempUrlGeneratorInterface $tempUrlGenerator; - private Security $security; - private UserProviderInterface $userProvider; public function __construct( @@ -44,7 +41,6 @@ final class ChillWopi implements WopiInterface StoredObjectRepository $storedObjectRepository, ClientInterface $httpClient, TempUrlGeneratorInterface $tempUrlGenerator, - Security $security, UserProviderInterface $userProvider ) { $this->psr17 = $psr17; @@ -52,7 +48,6 @@ final class ChillWopi implements WopiInterface $this->storedObjectRepository = $storedObjectRepository; $this->httpClient = $httpClient; $this->tempUrlGenerator = $tempUrlGenerator; - $this->security = $security; $this->userProvider = $userProvider; } @@ -88,9 +83,9 @@ final class ChillWopi implements WopiInterface ->withBody($this->psr17->createStream((string) json_encode( [ 'BaseFileName' => $storedObject->getFilename(), - 'OwnerId' => $user->getUsername(), + 'OwnerId' => uniqid(), 'Size' => 0, - 'UserId' => $user->getUsername(), + 'UserId' => uniqid(), // 'Version' => 'v' . uniqid(), 'ReadOnly' => false, 'UserCanWrite' => true, From 10c9526b49196ac69fbade5a197469e30a6709a8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 16:58:41 +0200 Subject: [PATCH 48/51] Fix property name. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index baf22529c..c191156fe 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -209,7 +209,7 @@ final class ChillWopi implements WopiInterface // TODO: Add strict typing in champs-libres/async-uploader-bundle /** @var StdClass $object */ - $object = $this->tempUrlGeneratorInterface->generate('PUT', $storedObject->getFilename()); + $object = $this->tempUrlGenerator->generate('PUT', $storedObject->getFilename()); $response = $this->httpClient->sendRequest($this->psr17->createRequest('PUT', $object->url)->withBody($request->getBody())); From c9cc0dd2a926a7538cfdf2db1bf037a89e1ddf8b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 19 Aug 2021 17:03:22 +0200 Subject: [PATCH 49/51] Update status code. --- src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php index c191156fe..bb0dfb8e2 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php @@ -213,7 +213,7 @@ final class ChillWopi implements WopiInterface $response = $this->httpClient->sendRequest($this->psr17->createRequest('PUT', $object->url)->withBody($request->getBody())); - if (200 !== $response->getStatusCode()) + if (201 !== $response->getStatusCode()) { return $this ->psr17 From 06abefd576ceac3266e89cb8c3ec750417727c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 19 Aug 2021 23:30:45 +0200 Subject: [PATCH 50/51] add redirection to wopi after doc generation --- .../DocGeneratorTemplateController.php | 45 ++++++++++--------- .../Entity/StoredObject.php | 6 +-- .../Resources/public/chill/js/date.js | 2 +- .../src/Resources/config/routes/routes.php | 2 +- 4 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php index 62093c065..a29a07864 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php @@ -3,6 +3,8 @@ namespace Chill\DocGeneratorBundle\Controller; use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository; +use Chill\DocStoreBundle\Entity\StoredObject; +use GuzzleHttp\Exception\TransferException; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\JsonResponse; @@ -54,7 +56,7 @@ class DocGeneratorTemplateController extends AbstractController * ) */ public function generateDocFromTemplateAction( - TempUrlOpenstackGenerator $tempUrlGenerator, + \ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface $tempUrlGenerator, DocGeneratorTemplate $template, string $entityClassName, int $entityId): Response { $getUrlGen = $tempUrlGenerator->generate( @@ -84,7 +86,7 @@ class DocGeneratorTemplateController extends AbstractController $fileContent = fopen($tmpfname2, 'r'); // the generated file content - $genDocName = 'doc_'.sprintf( '%010d', rand()).'.docx'; + $genDocName = 'doc_' . sprintf('%010d', rand()) . '.docx'; $getUrlGen = $tempUrlGenerator->generate( 'PUT', @@ -94,25 +96,28 @@ class DocGeneratorTemplateController extends AbstractController $client = new Client(); - $putResponse = $client->request('PUT', $getUrlGen->{'url'}, [ - 'body' => $fileContent - ]); + try { + $putResponse = $client->request('PUT', $getUrlGen->{'url'}, [ + 'body' => $fileContent + ]); - if ($putResponse->getStatusCode() == 201) { - return new JsonResponse( - array( - "msg" => "Document créé", - "id" => $genDocName, - "response" => array( - "reasonPhrase" => $putResponse->getReasonPhrase(), - "statusCode" => $putResponse->getStatusCode()))); + if ($putResponse->getStatusCode() == 201) { + $storedObject = new StoredObject(); + $storedObject + // currently, only docx is supported + ->setType('application/vnd.openxmlformats-officedocument.wordprocessingml.document') + ->setFilename($genDocName); + + $em = $this->getDoctrine()->getManager(); + $em->persist($storedObject); + $em->flush(); + + return $this->redirectToRoute('chill_wopi_file_edit', [ + 'fileId' => $genDocName + ]); + } + } catch (TransferException $e) { + throw $e; } - - return new JsonResponse( - array( - "msg" => "PBM", - "response" => array( - "reasonPhrase" => $putResponse->getReasonPhrase(), - "statusCode" => $putResponse->getStatusCode()))); } } diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index 538cab28b..019d9a124 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -37,14 +37,14 @@ class StoredObject implements AsyncFileInterface /** * @ORM\Column(type="json_array", name="key") */ - private array $keyInfos; + private array $keyInfos = []; /** * * @var int[] * @ORM\Column(type="json_array", name="iv") */ - private array $iv; + private array $iv = []; /** * @ORM\Column(type="datetime", name="creation_date") @@ -59,7 +59,7 @@ class StoredObject implements AsyncFileInterface /** * @ORM\Column(type="json_array", name="datas") */ - private array $datas; + private array $datas = []; public function __construct() { diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js index 44fab8dc2..dfe667536 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.js @@ -94,7 +94,7 @@ const datetimeToISO = (date) => { const intervalDaysToISO = (days) => { if (null === days) { - return 'PD0'; + return 'P0D'; } return `P${days}D`; diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php index e0f3447aa..60bd96bde 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php +++ b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php @@ -12,6 +12,6 @@ use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator; return static function (RoutingConfigurator $routes) { $routes - ->add('testtest', '/edit/{fileId}') + ->add('chill_wopi_file_edit', '/edit/{fileId}') ->controller(Test::class); }; From 7f28effc1e9f4a2279e2b456d701fa0a21a506cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 20 Aug 2021 12:44:15 +0200 Subject: [PATCH 51/51] Associate generate document with evaluation and update UX to go back to documents --- .../DocGeneratorTemplateController.php | 17 +++++- .../Entity/DocGeneratorTemplate.php | 4 +- .../Entity/StoredObject.php | 8 ++- .../AccompanyingPeriodWorkEvaluation.php | 17 ++++++ ...companyingPeriodWorkEvaluationDocument.php | 54 ++++++++++++++++--- .../components/AddEvaluation.vue | 23 ++++++-- .../migrations/Version20210820093927.php | 39 ++++++++++++++ .../migrations/Version20210820100407.php | 29 ++++++++++ 8 files changed, 175 insertions(+), 16 deletions(-) create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php index b8f53d1b2..56de44912 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php @@ -4,6 +4,9 @@ namespace Chill\DocGeneratorBundle\Controller; use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository; use Chill\DocStoreBundle\Entity\StoredObject; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation; +use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument; +use Chill\PersonBundle\Entity\SocialWork\Evaluation; use GuzzleHttp\Exception\TransferException; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; @@ -105,14 +108,26 @@ class DocGeneratorTemplateController extends AbstractController ]); if ($putResponse->getStatusCode() == 201) { + $em = $this->getDoctrine()->getManager(); $storedObject = new StoredObject(); $storedObject // currently, only docx is supported ->setType('application/vnd.openxmlformats-officedocument.wordprocessingml.document') ->setFilename($genDocName); - $em = $this->getDoctrine()->getManager(); $em->persist($storedObject); + + // Only for evaluation + if ($entity instanceof AccompanyingPeriodWorkEvaluation) { + $doc = new AccompanyingPeriodWorkEvaluationDocument(); + $doc + ->setStoredObject($storedObject) + ->setTemplate($template) + ; + $entity->addDocument($doc); + $em->persist($doc); + } + $em->flush(); return $this->redirectToRoute('chill_wopi_file_edit', [ diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php index d377773a5..ad8d62056 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php +++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php @@ -4,11 +4,11 @@ namespace Chill\DocGeneratorBundle\Entity; use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation as Serializer; /** * @ORM\Entity * @ORM\Table(name="chill_docgen_template") - */ class DocGeneratorTemplate { @@ -16,11 +16,13 @@ class DocGeneratorTemplate * @ORM\Id * @ORM\GeneratedValue * @ORM\Column(type="integer") + * @Serializer\Groups({"read"}) */ private int $id; /** * @ORM\Column(type="json_array") + * @Serializer\Groups({"read"}) */ private array $name = []; diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index 019d9a124..9c88e502d 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -8,12 +8,11 @@ use Doctrine\ORM\Mapping as ORM; use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface; use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists; use DateTimeInterface; +use Symfony\Component\Serializer\Annotation as Serializer; /** * Represent a document stored in an object store * - * @author Julien Fastré - * * @ORM\Entity() * @ORM\Table("chill_doc.stored_object") * @AsyncFileExists( @@ -26,11 +25,13 @@ class StoredObject implements AsyncFileInterface * @ORM\Id() * @ORM\GeneratedValue() * @ORM\Column(type="integer") + * @Serializer\Groups({"read"}) */ private $id; /** * @ORM\Column(type="text") + * @Serializer\Groups({"read"}) */ private $filename; @@ -48,16 +49,19 @@ class StoredObject implements AsyncFileInterface /** * @ORM\Column(type="datetime", name="creation_date") + * @Serializer\Groups({"read"}) */ private DateTimeInterface $creationDate; /** * @ORM\Column(type="text", name="type") + * @Serializer\Groups({"read"}) */ private string $type = ''; /** * @ORM\Column(type="json_array", name="datas") + * @Serializer\Groups({"read"}) */ private array $datas = []; diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php index 9c27aeb59..ef5156c4d 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php @@ -135,6 +135,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre * * @Serializer\Groups({"read"}) * @Serializer\Groups({"write"}) + * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) * * @var mixed * @@ -382,6 +383,22 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre return $this->documents; } + public function addDocument(AccompanyingPeriodWorkEvaluationDocument $document): self + { + if (!$this->documents->contains($document)) { + $this->documents[] = $document; + $document->setAccompanyingPeriodWorkEvaluation($this); + } + + return $this; + } + + public function removeDocument(AccompanyingPeriodWorkEvaluationDocument $document): self + { + $this->documents->removeElement($document); + return $this; + } + /** * Arbitrary data, used for client * diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php index f61955e1d..eb07cd4d8 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php @@ -2,6 +2,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate; use Chill\DocStoreBundle\Entity\StoredObject; use Chill\MainBundle\Doctrine\Model\TrackCreationInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; @@ -37,7 +38,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct * inversedBy="documents" * ) */ - private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation; + private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation = null; /** * @ORM\ManyToOne( @@ -45,13 +46,13 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct * ) * @Serializer\Groups({"read"}) */ - private ?User $createdBy; + private ?User $createdBy = null; /** * @ORM\Column(type="date_immutable", nullable=true, options={"default": null}) * @Serializer\Groups({"read"}) */ - private ?\DateTimeImmutable $createdAt; + private ?\DateTimeImmutable $createdAt = null; /** * @ORM\ManyToOne( @@ -59,18 +60,29 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct * ) * @Serializer\Groups({"read"}) */ - private ?User $updatedBy; + private ?User $updatedBy = null; /** * @ORM\Column(type="date_immutable", nullable=true, options={"default": null}) * @Serializer\Groups({"read"}) */ - private ?DateTimeImmutable $updatedAt; + private ?\DateTimeImmutable $updatedAt = null; - // TODO: indiquer le document généré par le module "document" - private ?StoredObject $storedObject; + /** + * @ORM\ManyToOne( + * targetEntity=StoredObject::class + * ) + * @Serializer\Groups({"read"}) + */ + private ?StoredObject $storedObject = null; - // TODO: ajouter gabarit + /** + * @ORM\ManyToOne( + * targetEntity=DocGeneratorTemplate::class + * ) + * @Serializer\Groups({"read"}) + */ + private ?DocGeneratorTemplate $template = null; /** * @return AccompanyingPeriodWorkEvaluation|null @@ -86,6 +98,14 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct */ public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument { + // if an evaluation is already associated, we cannot change the association (removing the association, + // by setting a null value, is allowed. + if ($this->accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation + && $accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation) { + if ($this->accompanyingPeriodWorkEvaluation !== $accompanyingPeriodWorkEvaluation) { + throw new \RuntimeException("It is not allowed to change the evaluation for a document"); + } + } $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation; return $this; } @@ -172,4 +192,22 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct return $this->updatedAt; } + /** + * @return DocGeneratorTemplate|null + */ + public function getTemplate(): ?DocGeneratorTemplate + { + return $this->template; + } + + /** + * @param DocGeneratorTemplate|null $template + * @return AccompanyingPeriodWorkEvaluationDocument + */ + public function setTemplate(?DocGeneratorTemplate $template): AccompanyingPeriodWorkEvaluationDocument + { + $this->template = $template; + return $this; + } + } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue index f7e0902f4..7653365e4 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue @@ -19,8 +19,20 @@
{{ $t('warningInterval') }} :
{{ evaluation.warningInterval }}
-
{{ $t('documents') }} :
-
{{ evaluation.documents.length }}
+
@@ -82,7 +94,7 @@ export default { computed: { pickedEvaluations() { return this.$store.state.evaluationsPicked; - } + }, }, methods: { removeEvaluation(e) { @@ -95,7 +107,10 @@ export default { }, submitForm() { this.toggleEditEvaluation(); - } + }, + buildEditLink(storedObject) { + return `/wopi/edit/${storedObject.filename}`; + }, } } diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php b/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php new file mode 100644 index 000000000..65b07766c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php @@ -0,0 +1,39 @@ +addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD template_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD storedObject_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD CONSTRAINT FK_33EC92296C99C13A FOREIGN KEY (storedObject_id) REFERENCES chill_doc.stored_object (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD CONSTRAINT FK_33EC92295DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('CREATE INDEX IDX_33EC92296C99C13A ON chill_person_accompanying_period_work_evaluation_document (storedObject_id)'); + $this->addSql('CREATE INDEX IDX_33EC92295DA0FB8 ON chill_person_accompanying_period_work_evaluation_document (template_id)'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP CONSTRAINT FK_33EC92296C99C13A'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP CONSTRAINT FK_33EC92295DA0FB8'); + $this->addSql('DROP INDEX IDX_33EC92296C99C13A'); + $this->addSql('DROP INDEX IDX_33EC92295DA0FB8'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP template_id'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP storedObject_id'); + } +} diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php b/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php new file mode 100644 index 000000000..fd05a884c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php @@ -0,0 +1,29 @@ +addSql('CREATE SEQUENCE chill_person_social_work_eval_doc_id_seq INCREMENT BY 1 MINVALUE 1000 START 1000'); + } + + public function down(Schema $schema): void + { + $this->addSql('DROP SEQUENCE chill_person_social_work_eval_doc_id_seq'); + } +}