diff --git a/drupal-10/package/customer_identity_and_access_management-5.2.0.tar.gz b/drupal-10/package/customer_identity_and_access_management-5.2.0.tar.gz new file mode 100644 index 0000000..d6c7cb5 Binary files /dev/null and b/drupal-10/package/customer_identity_and_access_management-5.2.0.tar.gz differ diff --git a/drupal-10/package/customer_identity_and_access_management.tar b/drupal-10/package/customer_identity_and_access_management.tar deleted file mode 100644 index 199db88..0000000 Binary files a/drupal-10/package/customer_identity_and_access_management.tar and /dev/null differ diff --git a/drupal-10/src/customer_identity_and_access_management/LICENSE.txt b/drupal-10/src/customer_identity_and_access_management/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/drupal-10/src/customer_identity_and_access_management/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + 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 +this service 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. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey 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 General Public License as published by + the Free Software Foundation; either version 2 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/drupal-10/src/customer_identity_and_access_management/README.md b/drupal-10/src/customer_identity_and_access_management/README.md index 9da1c8f..219c51e 100644 --- a/drupal-10/src/customer_identity_and_access_management/README.md +++ b/drupal-10/src/customer_identity_and_access_management/README.md @@ -30,6 +30,10 @@ Fully managed registration service including Email Registration, Social Login, p ## CHANGE LOG +### 5.2.0 + * Added full support of Drupal 10 + + ### 5.1.2 * Added Compatibility with Drupal 10 . * Minor Enhancement diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.css b/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.css index 29fdced..4d5b94c 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.css +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.css @@ -1,67 +1,57 @@ .lr-linked-data div>img { - vertical-align: middle; + vertical-align: middle } -input#loginradius-linksignin-email-me-a-link-to-sign-in:hover, -input#loginradius-linksignin-email-me-a-link-to-sign-in:active, -input#loginradius-linksignin-email-me-a-link-to-sign-in:focus { - border-bottom-style: outset; -} - -input#loginradius-linksignin-email-me-a-link-to-sign-in { - height: 31px; - color: #3b3b3b; +input#loginradius-linksignin-email-me-a-link-to-sign-in:active,input#loginradius-linksignin-email-me-a-link-to-sign-in:focus,input#loginradius-linksignin-email-me-a-link-to-sign-in:hover { + border-bottom-style: outset } #edit-phoneid { - background: #ededed; + background: #ededed } .ui-datepicker { - z-index: 9999999 !important; + z-index: 9999999!important } #edit-thanks-block { - background-color: #dfebf5; + background-color: #dfebf5 } #edit-phone-warning-block { - background-color: rgb(255, 255, 224); + background-color: #ffffe0 } ul.loginradiuscustomsso-idlinks { - list-style-type: none; + list-style-type: none } -div.loginradius-ciam-validation-message { - color: red; +.loginradius-validation-message,div.loginradius-ciam-validation-message { + color: red } -.ciam-lr-form.my-form-wrapper input[type=text], -.ciam-lr-form.my-form-wrapper input[type=email], -.ciam-lr-form.my-form-wrapper input[type=password] { +.ciam-lr-form.my-form-wrapper input[type=email],.ciam-lr-form.my-form-wrapper input[type=password],.ciam-lr-form.my-form-wrapper input[type=text],.ciam-lr-form.my-form-wrapper select { width: 363px; - color:black; + color: #000 } -#social-registration-container .loginradius-ciam--form-element-content input, -#social-registration-container .loginradius-ciam-option { - font-family: Arial, Helvetica, sans-serif; +#social-registration-container .loginradius-ciam--form-element-content input,#social-registration-container .loginradius-ciam-option { + font-family: Arial,Helvetica,sans-serif; color: #444; font-size: 13px; border: 1px solid #e2efe1; width: 350px; height: 27px; - margin-bottom: 5px !important; + margin-bottom: 5px!important; padding-left: 10px; border-radius: 0 12px; - background: #fff; + background: #fff } .popupinner { overflow: auto; background: #fff; - padding: 15px 20px; + padding: 15px 20px } #social-registration-container .loginradius-ciam-submit { @@ -70,14 +60,14 @@ div.loginradius-ciam-validation-message { cursor: pointer; text-align: center; text-decoration: none; - font: 14px/100% Arial, Helvetica, sans-serif; + font: 14px/100% Arial,Helvetica,sans-serif; padding: 5px 15px; width: auto; - color: #6e6e6e !important; + color: #6e6e6e!important; border: 1px solid #ddd; - border-radius: 0 11px !important; + border-radius: 0 11px!important; background: #efefef; - margin-top: 6px; + margin-top: 6px } .provideractive { @@ -85,96 +75,107 @@ div.loginradius-ciam-validation-message { -moz-box-shadow: inset 0 0 20px #c0dbf2; -ms-box-shadow: inset 0 0 20px #c0dbf2; box-shadow: inset 0 0 20px #c0dbf2; - -webkit-animation: glow 2s ease infinite; - -moz-animation: glow 2s ease infinite; + -webkit-animation: 2s infinite glow; + -moz-animation: 2s infinite glow; -ms-animation: glow 2s ease infinite; - animation: glow 2s ease infinite; + animation: 2s infinite glow } @-webkit-keyframes glow { 50% { - -webkit-box-shadow: inset 0 0 5px #c0dbf2; - -moz-box-shadow: inset 0 0 5px #c0dbf2; - -ms-box-shadow: inset 0 0 5px #c0dbf2; - box-shadow: inset 0 0 5px #c0dbf2; + -webkit-box-shadow: inset 0 0 5px #c0dbf2; + -moz-box-shadow: inset 0 0 5px #c0dbf2; + -ms-box-shadow: inset 0 0 5px #c0dbf2; + box-shadow: inset 0 0 5px #c0dbf2 } 100% { - -webkit-box-shadow: inset 0 0 20px #c0dbf2; - -moz-box-shadow: inset 0 0 20px #c0dbf2; - -ms-box-shadow: inset 0 0 20px #c0dbf2; - box-shadow: inset 0 0 20px #c0dbf2; + -webkit-box-shadow: inset 0 0 20px #c0dbf2; + -moz-box-shadow: inset 0 0 20px #c0dbf2; + -ms-box-shadow: inset 0 0 20px #c0dbf2; + box-shadow: inset 0 0 20px #c0dbf2 } } @-moz-keyframes glow { 50% { - -webkit-box-shadow: inset 0 0 5px #c0dbf2; - -moz-box-shadow: inset 0 0 5px #c0dbf2; - -ms-box-shadow: inset 0 0 5px #c0dbf2; - box-shadow: inset 0 0 5px #c0dbf2; + -webkit-box-shadow: inset 0 0 5px #c0dbf2; + -moz-box-shadow: inset 0 0 5px #c0dbf2; + -ms-box-shadow: inset 0 0 5px #c0dbf2; + box-shadow: inset 0 0 5px #c0dbf2 } 100% { - -webkit-box-shadow: inset 0 0 20px #c0dbf2; - -moz-box-shadow: inset 0 0 20px #c0dbf2; - -ms-box-shadow: inset 0 0 20px #c0dbf2; - box-shadow: inset 0 0 20px #c0dbf2; + -webkit-box-shadow: inset 0 0 20px #c0dbf2; + -moz-box-shadow: inset 0 0 20px #c0dbf2; + -ms-box-shadow: inset 0 0 20px #c0dbf2; + box-shadow: inset 0 0 20px #c0dbf2 } } @-ms-keyframes glow { 50% { - -webkit-box-shadow: inset 0 0 5px #c0dbf2; - -moz-box-shadow: inset 0 0 5px #c0dbf2; - -ms-box-shadow: inset 0 0 5px #c0dbf2; - box-shadow: inset 0 0 5px #c0dbf2; + -webkit-box-shadow: inset 0 0 5px #c0dbf2; + -moz-box-shadow: inset 0 0 5px #c0dbf2; + -ms-box-shadow: inset 0 0 5px #c0dbf2; + box-shadow: inset 0 0 5px #c0dbf2 } 100% { - -webkit-box-shadow: inset 0 0 20px #c0dbf2; - -moz-box-shadow: inset 0 0 20px #c0dbf2; - -ms-box-shadow: inset 0 0 20px #c0dbf2; - box-shadow: inset 0 0 20px #c0dbf2; + -webkit-box-shadow: inset 0 0 20px #c0dbf2; + -moz-box-shadow: inset 0 0 20px #c0dbf2; + -ms-box-shadow: inset 0 0 20px #c0dbf2; + box-shadow: inset 0 0 20px #c0dbf2 } } @keyframes glow { 50% { - -webkit-box-shadow: inset 0 0 5px #c0dbf2; - -moz-box-shadow: inset 0 0 5px #c0dbf2; - -ms-box-shadow: inset 0 0 5px #c0dbf2; - box-shadow: inset 0 0 5px #c0dbf2; + -webkit-box-shadow: inset 0 0 5px #c0dbf2; + -moz-box-shadow: inset 0 0 5px #c0dbf2; + -ms-box-shadow: inset 0 0 5px #c0dbf2; + box-shadow: inset 0 0 5px #c0dbf2 } 100% { - -webkit-box-shadow: inset 0 0 20px #c0dbf2; - -moz-box-shadow: inset 0 0 20px #c0dbf2; - -ms-box-shadow: inset 0 0 20px #c0dbf2; - box-shadow: inset 0 0 20px #c0dbf2; + -webkit-box-shadow: inset 0 0 20px #c0dbf2; + -moz-box-shadow: inset 0 0 20px #c0dbf2; + -ms-box-shadow: inset 0 0 20px #c0dbf2; + box-shadow: inset 0 0 20px #c0dbf2 } } .lr_singleglider_200 { - background: 0 0; + background: 0 0 +} + +.LoginRadius_overlay,.socialRegistration { + background: no-repeat rgba(127,127,127,.6); + top: 0; + left: 0; + z-index: 100001; + width: 100%; + height: 100%; + overflow: auto; + position: fixed } .lr_singleglider_200>h3 { color: #666; - font-family: Arial, Helvetica, sans-serif; + font-family: Arial,Helvetica,sans-serif; font-size: 12px; margin: 0; - padding: 10px 0 7px 3px; + padding: 10px 0 7px 3px } .lr_singleglider_200 .lr_icons_box { float: left; - margin: 0 0 6px; + margin: 0 0 6px } .lr_singleglider_200 .lr_icons_box div { float: left; - margin: 0 6px 0 0; + margin: 0 6px 0 0 } .lr_singleglider_200 .lr_providericons { @@ -186,294 +187,283 @@ div.loginradius-ciam-validation-message { position: relative; z-index: 9998; outline: 0; - margin: 0 auto; + margin: 0 auto } .lr_singleglider_200 .lr_aol { width: 38px; height: 38px; - background-position: 0 -950px; + background-position: 0 -950px } .lr_singleglider_200 .lr_facebook { width: 38px; height: 38px; - background-position: 0 -912px; + background-position: 0 -912px } .lr_singleglider_200 .lr_pinterest { width: 38px; height: 38px; - background-position: 0 74px; + background-position: 0 74px } .lr_singleglider_200 .lr_line { width: 38px; height: 38px; - background-position: 0 36px; + background-position: 0 36px } .lr_singleglider_200 .lr_foursquare { width: 38px; height: 38px; - background-position: 0 -874px; + background-position: 0 -874px } .lr_singleglider_200 .lr_github { width: 38px; height: 38px; - background-position: 0 -836px; + background-position: 0 -836px } .lr_singleglider_200 .lr_google { width: 38px; height: 38px; - background-position: 0 -798px; + background-position: 0 -798px } .lr_singleglider_200 .lr_hyves { width: 38px; height: 38px; - background-position: 0 -760px; + background-position: 0 -760px } .lr_singleglider_200 .lr_kaixin { width: 38px; height: 38px; - background-position: 0 -722px; + background-position: 0 -722px } .lr_singleglider_200 .lr_linkedin { width: 38px; height: 38px; - background-position: 0 -684px; + background-position: 0 -684px } .lr_singleglider_200 .lr_live { width: 38px; height: 38px; - background-position: 0 -646px; + background-position: 0 -646px } .lr_singleglider_200 .lr_livejournal { width: 38px; height: 38px; - background-position: 0 -608px; + background-position: 0 -608px } .lr_singleglider_200 .lr_mixi { width: 38px; height: 38px; - background-position: 0 -570px; + background-position: 0 -570px } .lr_singleglider_200 .lr_myopenid { width: 38px; height: 38px; - background-position: 0 -456px; + background-position: 0 -456px } .lr_singleglider_200 .lr_myspace { width: 38px; height: 38px; - background-position: 0 -494px; + background-position: 0 -494px } .lr_singleglider_200 .lr_openid { width: 38px; height: 38px; - background-position: 0 -532px; + background-position: 0 -532px } .lr_singleglider_200 .lr_orange { width: 38px; height: 38px; - background-position: 0 -418px; + background-position: 0 -418px } .lr_singleglider_200 .lr_persona { width: 38px; height: 38px; - background-position: 0 -380px; + background-position: 0 -380px } .lr_singleglider_200 .lr_qq { width: 38px; height: 38px; - background-position: 0 -342px; + background-position: 0 -342px } .lr_singleglider_200 .lr_renren { width: 38px; height: 38px; - background-position: 0 -304px; + background-position: 0 -304px } .lr_singleglider_200 .lr_stackexchange { width: 38px; height: 38px; - background-position: 0 -266px; + background-position: 0 -266px } .lr_singleglider_200 .lr_steamcommunity { width: 38px; height: 38px; - background-position: 0 -228px; + background-position: 0 -228px } .lr_singleglider_200 .lr_twitter { width: 38px; height: 38px; - background-position: 0 -190px; + background-position: 0 -190px } .lr_singleglider_200 .lr_verisign { width: 38px; height: 38px; - background-position: 0 -152px; + background-position: 0 -152px } .lr_singleglider_200 .lr_virgilio { width: 38px; height: 38px; - background-position: 0 -114px; + background-position: 0 -114px } .lr_singleglider_200 .lr_vkontakte { width: 38px; height: 38px; - background-position: 0 -76px; + background-position: 0 -76px } .lr_singleglider_200 .lr_wordpress { width: 38px; height: 38px; - background-position: 0 -38px; + background-position: 0 -38px } .lr_singleglider_200 .lr_yahoo { width: 38px; height: 38px; - background-position: 0 0; + background-position: 0 0 } .lr_singleglider_200 .arrow_next { width: 6px; height: 12px; - background-position: -38px -10px; + background-position: -38px -10px } .lr_singleglider_200 .arrow_prev { width: 5px; height: 10px; - background-position: -38px 0; + background-position: -38px 0 } .lr_singleglider_200 .lr_disqus { width: 38px; height: 38px; - background-position: 0 -1254px; + background-position: 0 -1254px } .lr_singleglider_200 .lr_instagram { width: 38px; height: 38px; - background-position: 0 -1178px; + background-position: 0 -1178px } .lr_singleglider_200 .lr_sinaweibo { width: 38px; height: 38px; - background-position: 0 -1140px; + background-position: 0 -1140px } .lr_singleglider_200 .lr_tumblr { width: 38px; height: 38px; - background-position: 0 -1216px; + background-position: 0 -1216px } .lr_singleglider_200 .lr_amazon { width: 38px; height: 38px; - background-position: 0 -989px; + background-position: 0 -989px } .lr_singleglider_200 .lr_odnoklassniki { width: 38px; height: 38px; - background-position: 0 -1026px; + background-position: 0 -1026px } .lr_singleglider_200 .lr_paypal { width: 38px; height: 38px; - background-position: 0 -1064px; + background-position: 0 -1064px } .lr_singleglider_200 .lr_salesforce { width: 38px; height: 38px; - background-position: 0 -1102px; + background-position: 0 -1102px } .lr_singleglider_200 .lr_xing { width: 38px; height: 38px; - background-position: 0 -1292px; + background-position: 0 -1292px } .lr_singleglider_200 .lr_mailru { width: 38px; height: 38px; - background-position: 0 -1330px; + background-position: 0 -1330px } .lr_powered_text { text-align: left; color: #21759b; - font-family: Arial, Helvetica, sans-serif; + font-family: Arial,Helvetica,sans-serif; font-size: 11px; margin: 0; - padding: 0 3px 6px 15px; + padding: 0 3px 6px 15px } #lr_powered_text_link { width: 130px; height: 13px; background-repeat: no-repeat; - display: block; + display: block } .lr-linked-data.lr_singleglider_200 span { - float: left; + float: left } .lr-linked-data.lr_singleglider_200 div { - clear: both; + clear: both } .lr-linked-data.lr_singleglider_200 span.lr_providericons { - margin: 0 6px 2px; + margin: 0 6px 2px } -.mymsg { - display: none; +#showRemovePopup,.mymsg,.page-wrapper .overlay,.user-form .field--type-boolean,.user-form .field--type-datetime,.user-form .field--type-decimal,.user-form .field--type-email,.user-form .field--type-entity-reference,.user-form .field--type-float,.user-form .field--type-integer,.user-form .field--type-link,.user-form .field--type-list-float,.user-form .field--type-list-integer,.user-form .field--type-list-string,.user-form .field--type-string,.user-form .field--type-text,.user-form .field--type-timestamp { + display: none } -.loginradius-validation-message { - color: red; -} - -.socialRegistration { - background: no-repeat rgba(127, 127, 127, .6); - top: 0; - left: 0; - z-index: 100001; - width: 100%; - height: 100%; - position: fixed; - overflow: auto; +.copyMessage,div#backupcode-table-body { + display: inline-block } .socialRegistration form[name=loginradius-socialRegistration] { @@ -481,63 +471,30 @@ div.loginradius-ciam-validation-message { width: 400px; padding: 30px; border: 1px solid #ddd; - border-radius: 0 11px !important; - margin: 10% auto; -} - -#showRemovePopup { - display: none; + border-radius: 0 11px!important; + margin: 10% auto } .LoginRadius_overlay { - background: #7f7f7f; - background: no-repeat rgba(127, 127, 127, .6); - top: 0; - left: 0; - z-index: 100001; - width: 100%; - height: 100%; - overflow: auto; - padding: 0; - position: fixed; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; - filter: alpha(opacity=90); + padding: 0 } -#addemail-form .lr-popupheading, -#removeemail-form .lr-popupheading { +#addemail-form .lr-popupheading,#removeemail-form .lr-popupheading { background: #efefef; font-size: 17px; font-weight: 400; line-height: 20px; padding: 15px; - border-radius: 0 20px 0 0; + border-radius: 0 20px 0 0 } .closeRemove { text-align: right; cursor: pointer; - margin-top: -22px; -} - -.removeEmail { - cursor: pointer; - border-radius: 5px; - width: 70px; - text-align: center; - background-color: darkgray; -} - -.addEmail { - cursor: pointer; - border-radius: 5px; - width: 70px; - text-align: center; - background-color: darkgray; + margin-top: -22px } -#addemail-form .popupmain, -#removeemail-form .popupmain { +#addemail-form .popupmain,#removeemail-form .popupmain { background: #fff; width: 506px; left: 50%; @@ -546,103 +503,90 @@ div.loginradius-ciam-validation-message { margin-top: -250px; position: absolute; z-index: 999999; - font-family: Arial, Helvetica, sans-serif; + font-family: Arial,Helvetica,sans-serif; font-size: 13px; - border-radius: 0 23px; + border-radius: 0 23px } -#addemail-form .lr-popup-footer, -#removeemail-form .lr-popup-footer { +#addemail-form .lr-popup-footer,#removeemail-form .lr-popup-footer { background: #efefef; border-radius: 0 0 0 20px; color: #000; - font-family: Arial, Helvetica, sans-serif; + font-family: Arial,Helvetica,sans-serif; font-size: 18px; font-weight: 400; height: 45px; padding: 7px 10px 0; - text-align: left; + text-align: left } -#addemail-container input[type=text], -#removeemail-container input[type=text] { - font-family: Arial, Helvetica, sans-serif; +#addemail-container input[type=text],#removeemail-container input[type=text] { + font-family: Arial,Helvetica,sans-serif; color: #444; border: 1px solid #e2efe1; width: 250px; height: 27px; - margin-bottom: 5px !important; + margin-bottom: 5px!important; padding-left: 10px; border-radius: 0 12px; background: #fff; - margin-left: 80px; + margin-left: 80px } -#addemail-container label, -#removeemail-container label { +#addemail-container label,#removeemail-container label { margin-top: 5px; - margin-left: 80px; -} - -#addemail-container input[type=submit], -#removeemail-container input[type=submit] { - margin-left: 62%; + margin-left: 80px } -#authentication-container input[type=button], -#authentication-container input[type=submit] { - background-color: darkseagreen; +#addemail-container input[type=submit],#removeemail-container input[type=submit] { + margin-left: 62% } .loginradius-linksignin { - margin-left: 2px; + margin-left: 2px } #edit-reset .resetCode:hover { background: #fff; color: #29d; border: 1px solid #29d; - cursor: pointer; + cursor: pointer } #edit-reset .resetCode { background: #29d; float: right; color: #fff; - padding: 6px 10px; + padding: 6px 10px } .resetCode { - margin-right: 5px; + margin-right: 5px } #lr_ciam_reset_table { clear: both; - margin-top: 45px; -} - -div#backupcode-table-body { - display: inline-block; + margin-top: 45px } #backupcode-table-body .form-item { float: left; - margin-top: -8px !important; + margin-top: -8px!important; width: 48%; background: #eee; border: 2px solid #fff; - padding: 5px; + padding: 5px } #resettable p { border: 1px solid red; padding: 5px; border-radius: 5px; - background: hsla(0, 100%, 50%, 0.18); + background: hsla(0,100%,50%,.18) } #resettable { - margin-right: 100px; + margin-right: 100px } .mybackupcopy { @@ -653,87 +597,97 @@ div#backupcode-table-body { background-size: 24px 24px; background-repeat: no-repeat; margin: 5px; - cursor: pointer; + cursor: pointer } .copyMessage { - background-color: #eeeeee; - display: inline-block; + background-color: #eee; padding: 6px 12px 5px 10px; color: #59b32c; margin-left: 86%; - margin-bottom: -21px; + margin-bottom: -21px } #login-container .linksignin-loginradius-Send { - padding: 4px; -} - -.content-loginradius-stayLogin label { - margin-top: -22px; - margin-left: 20px; + padding: 4px } .loginType { - font-weight: bold; + font-weight: 700 } .loginTypeTooltip { - text-decoration: none !important; - cursor: pointer !important; + text-decoration: none!important; + cursor: pointer!important } .logintypeColor { - color: #3cf; -} - -div.form-item-ciam-welcome-email-template label, -div.form-item-ciam-email-verification-template label, -div.form-item-ciam-reset-password-email-template label, -div.form-item-ciam-instant-link-login-email-template label, -div.form-item-ciam-welcome-sms-template label, -div.form-item-ciam-sms-template-phone-verification label, -div.form-item-ciam-sms-template-one-time-passcode label, -div.form-item-ciam-sms-template-reset-password label, -div.form-item-ciam-sms-template-change-phone-no label, -div.form-item-ciam-sms-template-2fa label { + color: #3cf +} + +#addEmail,#authentication-container input[type=button],#login-container input[type=button],#loginradius-submit-update-profile,#loginradius-button-resendotp,#loginradius-otp-resendotp,#loginradius-otp-skip,#loginradius-submit-login,#loginradius-submit-register,#loginradius-submit-reset-password,#loginradius-submit-send,#loginradius-submit-submit,#loginradius-submit-update,#loginradius-submit-verify,.loginradius-linksignin,.loginradius-otpsignin,.removeEmail { + margin-block:var(--sp0-5);color: var(--color--white); + border-color: var(--color--primary-40); + background-color: var(--color--primary-40); + display: inline-flex; + align-items: center; + padding-block:1px 0;padding-inline:var(--sp1-5);line-height: var(--line-height-s); + height: var(--sp3); + margin-inline-start:0;margin-inline-end:var(--sp1);cursor: pointer; + text-align: center; + -webkit-text-decoration: none; + text-decoration: none; + border: 2px solid currentColor; + border-radius: var(--border-radius); + font-family: var(--font-sans); + font-size: var(--font-size-l); + font-weight: 700; + appearance: none; + -webkit-font-smoothing: antialiased +} + +.messages--error,.messages--status { + margin-bottom: 20px +} + +#authentication-container label,#changepassword-container label,#forgotpassword-container label,#login-container label,#registration-container label,#resetpassword-container label,#updatephone-container label,#profileeditor-container label { + display: block +} + +#authentication-container input,#changepassword-container input,#forgotpassword-container input,#login-container input,#registration-container input,#registration-container select,#resetpassword-container input,#updatephone-container input,#profileeditor-container input { + margin-top: 10px +} + +#resetCode,.content-loginradius-acceptprivacypolicy label,.content-loginradius-stayLogin label { + margin-top: -22px; + margin-left: 30px +} + +div.form-item-ciam-email-verification-template label,div.form-item-ciam-instant-link-login-email-template label,div.form-item-ciam-reset-password-email-template label,div.form-item-ciam-sms-template-2fa label,div.form-item-ciam-sms-template-change-phone-no label,div.form-item-ciam-sms-template-one-time-passcode label,div.form-item-ciam-sms-template-phone-verification label,div.form-item-ciam-sms-template-reset-password label,div.form-item-ciam-welcome-email-template label,div.form-item-ciam-welcome-sms-template label { margin-top: 18px; margin-bottom: -18px; - position: relative; + position: relative } -#edit-ciam-welcome-email-template, -#edit-ciam-email-verification-template, -#edit-ciam-reset-password-email-template, -#edit-ciam-instant-link-login-email-template, -#edit-ciam-welcome-sms-template, -#edit-ciam-sms-template-phone-verification, -#edit-ciam-sms-template-reset-password, -#edit-ciam-sms-template-change-phone-no, -#edit-ciam-sms-template-one-time-passcode, -#edit-ciam-sms-template-2fa { - margin: 0px 0px 0px 440px; +#edit-ciam-email-verification-template,#edit-ciam-instant-link-login-email-template,#edit-ciam-reset-password-email-template,#edit-ciam-sms-template-2fa,#edit-ciam-sms-template-change-phone-no,#edit-ciam-sms-template-one-time-passcode,#edit-ciam-sms-template-phone-verification,#edit-ciam-sms-template-reset-password,#edit-ciam-welcome-email-template,#edit-ciam-welcome-sms-template { + margin: 0 0 0 440px; clear: both; - width: 150px; + width: 150px } #ciam_show_button { - left: 504px; - padding: 7px 8px; + left: 604px; + padding: 12px; background: #29d; width: 40px; color: #fff; position: absolute; text-align: center; cursor: pointer; - margin-top: -40px; + margin-top: -71px } -#loginradius-submit-login, -#loginradius-submit-register, -#loginradius-submit-send{ - color: black; -} -.oneclick--errormsg{ + +.oneclick--errormsg { color: #a51b00; background-color: #fcf4f2; box-shadow: -8px 0 0 #e62600; @@ -742,22 +696,5 @@ div.form-item-ciam-sms-template-2fa label { border-width: 1px 1px 1px 0; margin-top: 15px; border-radius: 2px; - overflow-wrap: break-word; -} -.user-form .field--type-boolean, -.user-form .field--type-string, -.user-form .field--type-list-string, -.user-form .field--type-entity-reference, -.user-form .field--type-datetime, -.user-form .field--type-email, -.user-form .field--type-timestamp, -.user-form .field--type-link, -.user-form .field--type-list-float, -.user-form .field--type-list-integer, -.user-form .field--type-decimal, -.user-form .field--type-float, -.user-form .field--type-integer, -.user-form .field--type-text -{ - display:none; + overflow-wrap: break-word } diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.min.css b/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.min.css index 6667d69..f3c2458 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.min.css +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/css/ciam.min.css @@ -1 +1 @@ -.lr-linked-data div>img{vertical-align:middle}input#loginradius-linksignin-email-me-a-link-to-sign-in:active,input#loginradius-linksignin-email-me-a-link-to-sign-in:focus,input#loginradius-linksignin-email-me-a-link-to-sign-in:hover{border-bottom-style:outset}input#loginradius-linksignin-email-me-a-link-to-sign-in{height:31px;color:#3b3b3b}#edit-phoneid{background:#ededed}.ui-datepicker{z-index:9999999!important}#edit-thanks-block{background-color:#dfebf5}#edit-phone-warning-block{background-color:#ffffe0}ul.loginradiuscustomsso-idlinks{list-style-type:none}div.loginradius-ciam-validation-message{color:red}.ciam-lr-form.my-form-wrapper input[type=email],.ciam-lr-form.my-form-wrapper input[type=password],.ciam-lr-form.my-form-wrapper input[type=text]{width:363px;color:#000}#social-registration-container .loginradius-ciam--form-element-content input,#social-registration-container .loginradius-ciam-option{font-family:Arial,Helvetica,sans-serif;color:#444;font-size:13px;border:1px solid #e2efe1;width:350px;height:27px;margin-bottom:5px!important;padding-left:10px;border-radius:0 12px;background:#fff}.popupinner{overflow:auto;background:#fff;padding:15px 20px}#social-registration-container .loginradius-ciam-submit{display:inline-block;outline:0;cursor:pointer;text-align:center;text-decoration:none;font:14px/100% Arial,Helvetica,sans-serif;padding:5px 15px;width:auto;color:#6e6e6e!important;border:1px solid #ddd;border-radius:0 11px!important;background:#efefef;margin-top:6px}.provideractive{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2;-webkit-animation:glow 2s ease infinite;-moz-animation:glow 2s ease infinite;-ms-animation:glow 2s ease infinite;animation:glow 2s ease infinite}@-webkit-keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}@-moz-keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}@-ms-keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}@keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}.lr_singleglider_200{background:0 0}.lr_singleglider_200>h3{color:#666;font-family:Arial,Helvetica,sans-serif;font-size:12px;margin:0;padding:10px 0 7px 3px}.lr_singleglider_200 .lr_icons_box{float:left;margin:0 0 6px}.lr_singleglider_200 .lr_icons_box div{float:left;margin:0 6px 0 0}.lr_singleglider_200 .lr_providericons{width:38px;height:38px;background-image:url(../images/lr_provider_sprite.png);cursor:pointer;display:block;position:relative;z-index:9998;outline:0;margin:0 auto}.lr_singleglider_200 .lr_aol{width:38px;height:38px;background-position:0 -950px}.lr_singleglider_200 .lr_facebook{width:38px;height:38px;background-position:0 -912px}.lr_singleglider_200 .lr_pinterest{width:38px;height:38px;background-position:0 74px}.lr_singleglider_200 .lr_line{width:38px;height:38px;background-position:0 36px}.lr_singleglider_200 .lr_foursquare{width:38px;height:38px;background-position:0 -874px}.lr_singleglider_200 .lr_github{width:38px;height:38px;background-position:0 -836px}.lr_singleglider_200 .lr_google{width:38px;height:38px;background-position:0 -798px}.lr_singleglider_200 .lr_hyves{width:38px;height:38px;background-position:0 -760px}.lr_singleglider_200 .lr_kaixin{width:38px;height:38px;background-position:0 -722px}.lr_singleglider_200 .lr_linkedin{width:38px;height:38px;background-position:0 -684px}.lr_singleglider_200 .lr_live{width:38px;height:38px;background-position:0 -646px}.lr_singleglider_200 .lr_livejournal{width:38px;height:38px;background-position:0 -608px}.lr_singleglider_200 .lr_mixi{width:38px;height:38px;background-position:0 -570px}.lr_singleglider_200 .lr_myopenid{width:38px;height:38px;background-position:0 -456px}.lr_singleglider_200 .lr_myspace{width:38px;height:38px;background-position:0 -494px}.lr_singleglider_200 .lr_openid{width:38px;height:38px;background-position:0 -532px}.lr_singleglider_200 .lr_orange{width:38px;height:38px;background-position:0 -418px}.lr_singleglider_200 .lr_persona{width:38px;height:38px;background-position:0 -380px}.lr_singleglider_200 .lr_qq{width:38px;height:38px;background-position:0 -342px}.lr_singleglider_200 .lr_renren{width:38px;height:38px;background-position:0 -304px}.lr_singleglider_200 .lr_stackexchange{width:38px;height:38px;background-position:0 -266px}.lr_singleglider_200 .lr_steamcommunity{width:38px;height:38px;background-position:0 -228px}.lr_singleglider_200 .lr_twitter{width:38px;height:38px;background-position:0 -190px}.lr_singleglider_200 .lr_verisign{width:38px;height:38px;background-position:0 -152px}.lr_singleglider_200 .lr_virgilio{width:38px;height:38px;background-position:0 -114px}.lr_singleglider_200 .lr_vkontakte{width:38px;height:38px;background-position:0 -76px}.lr_singleglider_200 .lr_wordpress{width:38px;height:38px;background-position:0 -38px}.lr_singleglider_200 .lr_yahoo{width:38px;height:38px;background-position:0 0}.lr_singleglider_200 .arrow_next{width:6px;height:12px;background-position:-38px -10px}.lr_singleglider_200 .arrow_prev{width:5px;height:10px;background-position:-38px 0}.lr_singleglider_200 .lr_disqus{width:38px;height:38px;background-position:0 -1254px}.lr_singleglider_200 .lr_instagram{width:38px;height:38px;background-position:0 -1178px}.lr_singleglider_200 .lr_sinaweibo{width:38px;height:38px;background-position:0 -1140px}.lr_singleglider_200 .lr_tumblr{width:38px;height:38px;background-position:0 -1216px}.lr_singleglider_200 .lr_amazon{width:38px;height:38px;background-position:0 -989px}.lr_singleglider_200 .lr_odnoklassniki{width:38px;height:38px;background-position:0 -1026px}.lr_singleglider_200 .lr_paypal{width:38px;height:38px;background-position:0 -1064px}.lr_singleglider_200 .lr_salesforce{width:38px;height:38px;background-position:0 -1102px}.lr_singleglider_200 .lr_xing{width:38px;height:38px;background-position:0 -1292px}.lr_singleglider_200 .lr_mailru{width:38px;height:38px;background-position:0 -1330px}.lr_powered_text{text-align:left;color:#21759b;font-family:Arial,Helvetica,sans-serif;font-size:11px;margin:0;padding:0 3px 6px 15px}#lr_powered_text_link{width:130px;height:13px;background-repeat:no-repeat;display:block}.lr-linked-data.lr_singleglider_200 span{float:left}.lr-linked-data.lr_singleglider_200 div{clear:both}.lr-linked-data.lr_singleglider_200 span.lr_providericons{margin:0 6px 2px}.mymsg{display:none}.loginradius-validation-message{color:red}.socialRegistration{background:no-repeat rgba(127,127,127,.6);top:0;left:0;z-index:100001;width:100%;height:100%;position:fixed;overflow:auto}.socialRegistration form[name=loginradius-socialRegistration]{background:#fff;width:400px;padding:30px;border:1px solid #ddd;border-radius:0 11px!important;margin:10% auto}#showRemovePopup{display:none}.LoginRadius_overlay{background:#7f7f7f;background:no-repeat rgba(127,127,127,.6);top:0;left:0;z-index:100001;width:100%;height:100%;overflow:auto;padding:0;position:fixed}#addemail-form .lr-popupheading,#removeemail-form .lr-popupheading{background:#efefef;font-size:17px;font-weight:400;line-height:20px;padding:15px;border-radius:0 20px 0 0}.closeRemove{text-align:right;cursor:pointer;margin-top:-22px}.removeEmail{cursor:pointer;border-radius:5px;width:70px;text-align:center;background-color:#a9a9a9}.addEmail{cursor:pointer;border-radius:5px;width:70px;text-align:center;background-color:#a9a9a9}#addemail-form .popupmain,#removeemail-form .popupmain{background:#fff;width:506px;left:50%;top:45%;margin-left:-250px;margin-top:-250px;position:absolute;z-index:999999;font-family:Arial,Helvetica,sans-serif;font-size:13px;border-radius:0 23px}#addemail-form .lr-popup-footer,#removeemail-form .lr-popup-footer{background:#efefef;border-radius:0 0 0 20px;color:#000;font-family:Arial,Helvetica,sans-serif;font-size:18px;font-weight:400;height:45px;padding:7px 10px 0;text-align:left}#addemail-container input[type=text],#removeemail-container input[type=text]{font-family:Arial,Helvetica,sans-serif;color:#444;border:1px solid #e2efe1;width:250px;height:27px;margin-bottom:5px!important;padding-left:10px;border-radius:0 12px;background:#fff;margin-left:80px}#addemail-container label,#removeemail-container label{margin-top:5px;margin-left:80px}#addemail-container input[type=submit],#removeemail-container input[type=submit]{margin-left:62%}#authentication-container input[type=button],#authentication-container input[type=submit]{background-color:#8fbc8f}.loginradius-linksignin{margin-left:2px}#edit-reset .resetCode:hover{background:#fff;color:#29d;border:1px solid #29d;cursor:pointer}#edit-reset .resetCode{background:#29d;float:right;color:#fff;padding:6px 10px}.resetCode{margin-right:5px}#lr_ciam_reset_table{clear:both;margin-top:45px}div#backupcode-table-body{display:inline-block}#backupcode-table-body .form-item{float:left;margin-top:-8px!important;width:48%;background:#eee;border:2px solid #fff;padding:5px}#resettable p{border:1px solid red;padding:5px;border-radius:5px;background:hsla(0,100%,50%,.18)}#resettable{margin-right:100px}.mybackupcopy{width:32px;float:right;background-image:url(../images/copy.png);height:40px;background-size:24px 24px;background-repeat:no-repeat;margin:5px;cursor:pointer}.copyMessage{background-color:#eee;display:inline-block;padding:6px 12px 5px 10px;color:#59b32c;margin-left:86%;margin-bottom:-21px}#login-container .linksignin-loginradius-Send{padding:4px}.content-loginradius-stayLogin label{margin-top:-22px;margin-left:20px}.loginType{font-weight:700}.loginTypeTooltip{text-decoration:none!important;cursor:pointer!important}.logintypeColor{color:#3cf}div.form-item-ciam-email-verification-template label,div.form-item-ciam-instant-link-login-email-template label,div.form-item-ciam-reset-password-email-template label,div.form-item-ciam-sms-template-2fa label,div.form-item-ciam-sms-template-change-phone-no label,div.form-item-ciam-sms-template-one-time-passcode label,div.form-item-ciam-sms-template-phone-verification label,div.form-item-ciam-sms-template-reset-password label,div.form-item-ciam-welcome-email-template label,div.form-item-ciam-welcome-sms-template label{margin-top:18px;margin-bottom:-18px;position:relative}#edit-ciam-email-verification-template,#edit-ciam-instant-link-login-email-template,#edit-ciam-reset-password-email-template,#edit-ciam-sms-template-2fa,#edit-ciam-sms-template-change-phone-no,#edit-ciam-sms-template-one-time-passcode,#edit-ciam-sms-template-phone-verification,#edit-ciam-sms-template-reset-password,#edit-ciam-welcome-email-template,#edit-ciam-welcome-sms-template{margin:0 0 0 440px;clear:both;width:150px}#ciam_show_button{left:504px;padding:7px 8px;background:#29d;width:40px;color:#fff;position:absolute;text-align:center;cursor:pointer;margin-top:-40px}#loginradius-submit-login,#loginradius-submit-register,#loginradius-submit-send{color:#000}.oneclick--errormsg{color:#a51b00;background-color:#fcf4f2;box-shadow:-8px 0 0 #e62600;padding:15px 20px 15px 35px;border:1px solid;border-width:1px 1px 1px 0;margin-top:15px;border-radius:2px;overflow-wrap:break-word}.user-form .field--type-boolean,.user-form .field--type-datetime,.user-form .field--type-decimal,.user-form .field--type-email,.user-form .field--type-entity-reference,.user-form .field--type-float,.user-form .field--type-integer,.user-form .field--type-link,.user-form .field--type-list-float,.user-form .field--type-list-integer,.user-form .field--type-list-string,.user-form .field--type-string,.user-form .field--type-text,.user-form .field--type-timestamp{display:none} \ No newline at end of file +.lr-linked-data div>img{vertical-align:middle}input#loginradius-linksignin-email-me-a-link-to-sign-in:active,input#loginradius-linksignin-email-me-a-link-to-sign-in:focus,input#loginradius-linksignin-email-me-a-link-to-sign-in:hover{border-bottom-style:outset}#edit-phoneid{background:#ededed}.ui-datepicker{z-index:9999999!important}#edit-thanks-block{background-color:#dfebf5}#edit-phone-warning-block{background-color:#ffffe0}ul.loginradiuscustomsso-idlinks{list-style-type:none}.loginradius-validation-message,div.loginradius-ciam-validation-message{color:red}.ciam-lr-form.my-form-wrapper input[type=email],.ciam-lr-form.my-form-wrapper input[type=password],.ciam-lr-form.my-form-wrapper input[type=text],.ciam-lr-form.my-form-wrapper select{width:363px;color:#000}#social-registration-container .loginradius-ciam--form-element-content input,#social-registration-container .loginradius-ciam-option{font-family:Arial,Helvetica,sans-serif;color:#444;font-size:13px;border:1px solid #e2efe1;width:350px;height:27px;margin-bottom:5px!important;padding-left:10px;border-radius:0 12px;background:#fff}.popupinner{overflow:auto;background:#fff;padding:15px 20px}#social-registration-container .loginradius-ciam-submit{display:inline-block;outline:0;cursor:pointer;text-align:center;text-decoration:none;font:14px/100% Arial,Helvetica,sans-serif;padding:5px 15px;width:auto;color:#6e6e6e!important;border:1px solid #ddd;border-radius:0 11px!important;background:#efefef;margin-top:6px}.provideractive{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2;-webkit-animation:2s infinite glow;-moz-animation:2s infinite glow;-ms-animation:glow 2s ease infinite;animation:2s infinite glow}@-webkit-keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}@-moz-keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}@-ms-keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}@keyframes glow{50%{-webkit-box-shadow:inset 0 0 5px #c0dbf2;-moz-box-shadow:inset 0 0 5px #c0dbf2;-ms-box-shadow:inset 0 0 5px #c0dbf2;box-shadow:inset 0 0 5px #c0dbf2}100%{-webkit-box-shadow:inset 0 0 20px #c0dbf2;-moz-box-shadow:inset 0 0 20px #c0dbf2;-ms-box-shadow:inset 0 0 20px #c0dbf2;box-shadow:inset 0 0 20px #c0dbf2}}.lr_singleglider_200{background:0 0}.LoginRadius_overlay,.socialRegistration{background:no-repeat rgba(127,127,127,.6);top:0;left:0;z-index:100001;width:100%;height:100%;overflow:auto;position:fixed}.lr_singleglider_200>h3{color:#666;font-family:Arial,Helvetica,sans-serif;font-size:12px;margin:0;padding:10px 0 7px 3px}.lr_singleglider_200 .lr_icons_box{float:left;margin:0 0 6px}.lr_singleglider_200 .lr_icons_box div{float:left;margin:0 6px 0 0}.lr_singleglider_200 .lr_providericons{width:38px;height:38px;background-image:url(../images/lr_provider_sprite.png);cursor:pointer;display:block;position:relative;z-index:9998;outline:0;margin:0 auto}.lr_singleglider_200 .lr_aol{width:38px;height:38px;background-position:0 -950px}.lr_singleglider_200 .lr_facebook{width:38px;height:38px;background-position:0 -912px}.lr_singleglider_200 .lr_pinterest{width:38px;height:38px;background-position:0 74px}.lr_singleglider_200 .lr_line{width:38px;height:38px;background-position:0 36px}.lr_singleglider_200 .lr_foursquare{width:38px;height:38px;background-position:0 -874px}.lr_singleglider_200 .lr_github{width:38px;height:38px;background-position:0 -836px}.lr_singleglider_200 .lr_google{width:38px;height:38px;background-position:0 -798px}.lr_singleglider_200 .lr_hyves{width:38px;height:38px;background-position:0 -760px}.lr_singleglider_200 .lr_kaixin{width:38px;height:38px;background-position:0 -722px}.lr_singleglider_200 .lr_linkedin{width:38px;height:38px;background-position:0 -684px}.lr_singleglider_200 .lr_live{width:38px;height:38px;background-position:0 -646px}.lr_singleglider_200 .lr_livejournal{width:38px;height:38px;background-position:0 -608px}.lr_singleglider_200 .lr_mixi{width:38px;height:38px;background-position:0 -570px}.lr_singleglider_200 .lr_myopenid{width:38px;height:38px;background-position:0 -456px}.lr_singleglider_200 .lr_myspace{width:38px;height:38px;background-position:0 -494px}.lr_singleglider_200 .lr_openid{width:38px;height:38px;background-position:0 -532px}.lr_singleglider_200 .lr_orange{width:38px;height:38px;background-position:0 -418px}.lr_singleglider_200 .lr_persona{width:38px;height:38px;background-position:0 -380px}.lr_singleglider_200 .lr_qq{width:38px;height:38px;background-position:0 -342px}.lr_singleglider_200 .lr_renren{width:38px;height:38px;background-position:0 -304px}.lr_singleglider_200 .lr_stackexchange{width:38px;height:38px;background-position:0 -266px}.lr_singleglider_200 .lr_steamcommunity{width:38px;height:38px;background-position:0 -228px}.lr_singleglider_200 .lr_twitter{width:38px;height:38px;background-position:0 -190px}.lr_singleglider_200 .lr_verisign{width:38px;height:38px;background-position:0 -152px}.lr_singleglider_200 .lr_virgilio{width:38px;height:38px;background-position:0 -114px}.lr_singleglider_200 .lr_vkontakte{width:38px;height:38px;background-position:0 -76px}.lr_singleglider_200 .lr_wordpress{width:38px;height:38px;background-position:0 -38px}.lr_singleglider_200 .lr_yahoo{width:38px;height:38px;background-position:0 0}.lr_singleglider_200 .arrow_next{width:6px;height:12px;background-position:-38px -10px}.lr_singleglider_200 .arrow_prev{width:5px;height:10px;background-position:-38px 0}.lr_singleglider_200 .lr_disqus{width:38px;height:38px;background-position:0 -1254px}.lr_singleglider_200 .lr_instagram{width:38px;height:38px;background-position:0 -1178px}.lr_singleglider_200 .lr_sinaweibo{width:38px;height:38px;background-position:0 -1140px}.lr_singleglider_200 .lr_tumblr{width:38px;height:38px;background-position:0 -1216px}.lr_singleglider_200 .lr_amazon{width:38px;height:38px;background-position:0 -989px}.lr_singleglider_200 .lr_odnoklassniki{width:38px;height:38px;background-position:0 -1026px}.lr_singleglider_200 .lr_paypal{width:38px;height:38px;background-position:0 -1064px}.lr_singleglider_200 .lr_salesforce{width:38px;height:38px;background-position:0 -1102px}.lr_singleglider_200 .lr_xing{width:38px;height:38px;background-position:0 -1292px}.lr_singleglider_200 .lr_mailru{width:38px;height:38px;background-position:0 -1330px}.lr_powered_text{text-align:left;color:#21759b;font-family:Arial,Helvetica,sans-serif;font-size:11px;margin:0;padding:0 3px 6px 15px}#lr_powered_text_link{width:130px;height:13px;background-repeat:no-repeat;display:block}.lr-linked-data.lr_singleglider_200 span{float:left}.lr-linked-data.lr_singleglider_200 div{clear:both}.lr-linked-data.lr_singleglider_200 span.lr_providericons{margin:0 6px 2px}#showRemovePopup,.mymsg,.page-wrapper .overlay,.user-form .field--type-boolean,.user-form .field--type-datetime,.user-form .field--type-decimal,.user-form .field--type-email,.user-form .field--type-entity-reference,.user-form .field--type-float,.user-form .field--type-integer,.user-form .field--type-link,.user-form .field--type-list-float,.user-form .field--type-list-integer,.user-form .field--type-list-string,.user-form .field--type-string,.user-form .field--type-text,.user-form .field--type-timestamp{display:none}.copyMessage,div#backupcode-table-body{display:inline-block}.socialRegistration form[name=loginradius-socialRegistration]{background:#fff;width:400px;padding:30px;border:1px solid #ddd;border-radius:0 11px!important;margin:10% auto}.LoginRadius_overlay{padding:0}#addemail-form .lr-popupheading,#removeemail-form .lr-popupheading{background:#efefef;font-size:17px;font-weight:400;line-height:20px;padding:15px;border-radius:0 20px 0 0}.closeRemove{text-align:right;cursor:pointer;margin-top:-22px}#addemail-form .popupmain,#removeemail-form .popupmain{background:#fff;width:506px;left:50%;top:45%;margin-left:-250px;margin-top:-250px;position:absolute;z-index:999999;font-family:Arial,Helvetica,sans-serif;font-size:13px;border-radius:0 23px}#addemail-form .lr-popup-footer,#removeemail-form .lr-popup-footer{background:#efefef;border-radius:0 0 0 20px;color:#000;font-family:Arial,Helvetica,sans-serif;font-size:18px;font-weight:400;height:45px;padding:7px 10px 0;text-align:left}#addemail-container input[type=text],#removeemail-container input[type=text]{font-family:Arial,Helvetica,sans-serif;color:#444;border:1px solid #e2efe1;width:250px;height:27px;margin-bottom:5px!important;padding-left:10px;border-radius:0 12px;background:#fff;margin-left:80px}#addemail-container label,#removeemail-container label{margin-top:5px;margin-left:80px}#addemail-container input[type=submit],#removeemail-container input[type=submit]{margin-left:62%}.loginradius-linksignin{margin-left:2px}#edit-reset .resetCode:hover{background:#fff;color:#29d;border:1px solid #29d;cursor:pointer}#edit-reset .resetCode{background:#29d;float:right;color:#fff;padding:6px 10px}.resetCode{margin-right:5px}#lr_ciam_reset_table{clear:both;margin-top:45px}#backupcode-table-body .form-item{float:left;margin-top:-8px!important;width:48%;background:#eee;border:2px solid #fff;padding:5px}#resettable p{border:1px solid red;padding:5px;border-radius:5px;background:hsla(0,100%,50%,.18)}#resettable{margin-right:100px}.mybackupcopy{width:32px;float:right;background-image:url(../images/copy.png);height:40px;background-size:24px 24px;background-repeat:no-repeat;margin:5px;cursor:pointer}.copyMessage{background-color:#eee;padding:6px 12px 5px 10px;color:#59b32c;margin-left:86%;margin-bottom:-21px}#login-container .linksignin-loginradius-Send{padding:4px}.loginType{font-weight:700}.loginTypeTooltip{text-decoration:none!important;cursor:pointer!important}.logintypeColor{color:#3cf}#addEmail,#authentication-container input[type=button],#login-container input[type=button],#loginradius-button-resendotp,#loginradius-otp-resendotp,#loginradius-otp-skip,#loginradius-submit-login,#loginradius-submit-register,#loginradius-submit-reset-password,#loginradius-submit-send,#loginradius-submit-submit,#loginradius-submit-update,#loginradius-submit-update-profile,#loginradius-submit-verify,.loginradius-linksignin,.loginradius-otpsignin,.removeEmail{margin-block:var(--sp0-5);color:var(--color--white);border-color:var(--color--primary-40);background-color:var(--color--primary-40);display:inline-flex;align-items:center;padding-block:1px 0;padding-inline:var(--sp1-5);line-height:var(--line-height-s);height:var(--sp3);margin-inline-start:0;margin-inline-end:var(--sp1);cursor:pointer;text-align:center;-webkit-text-decoration:none;text-decoration:none;border:2px solid currentColor;border-radius:var(--border-radius);font-family:var(--font-sans);font-size:var(--font-size-l);font-weight:700;appearance:none;-webkit-font-smoothing:antialiased}.messages--error,.messages--status{margin-bottom:20px}#authentication-container label,#changepassword-container label,#forgotpassword-container label,#login-container label,#profileeditor-container label,#registration-container label,#resetpassword-container label,#updatephone-container label{display:block}#authentication-container input,#changepassword-container input,#forgotpassword-container input,#login-container input,#profileeditor-container input,#registration-container input,#registration-container select,#resetpassword-container input,#updatephone-container input{margin-top:10px}#resetCode,.content-loginradius-acceptprivacypolicy label,.content-loginradius-stayLogin label{margin-top:-22px;margin-left:30px}div.form-item-ciam-email-verification-template label,div.form-item-ciam-instant-link-login-email-template label,div.form-item-ciam-reset-password-email-template label,div.form-item-ciam-sms-template-2fa label,div.form-item-ciam-sms-template-change-phone-no label,div.form-item-ciam-sms-template-one-time-passcode label,div.form-item-ciam-sms-template-phone-verification label,div.form-item-ciam-sms-template-reset-password label,div.form-item-ciam-welcome-email-template label,div.form-item-ciam-welcome-sms-template label{margin-top:18px;margin-bottom:-18px;position:relative}#edit-ciam-email-verification-template,#edit-ciam-instant-link-login-email-template,#edit-ciam-reset-password-email-template,#edit-ciam-sms-template-2fa,#edit-ciam-sms-template-change-phone-no,#edit-ciam-sms-template-one-time-passcode,#edit-ciam-sms-template-phone-verification,#edit-ciam-sms-template-reset-password,#edit-ciam-welcome-email-template,#edit-ciam-welcome-sms-template{margin:0 0 0 440px;clear:both;width:150px}#ciam_show_button{left:604px;padding:12px;background:#29d;width:40px;color:#fff;position:absolute;text-align:center;cursor:pointer;margin-top:-71px}.oneclick--errormsg{color:#a51b00;background-color:#fcf4f2;box-shadow:-8px 0 0 #e62600;padding:15px 20px 15px 35px;border:1px solid;border-width:1px 1px 1px 0;margin-top:15px;border-radius:2px;overflow-wrap:break-word} \ No newline at end of file diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/customhttpclient.php b/drupal-10/src/customer_identity_and_access_management/lr_ciam/customhttpclient.php index c903e90..21a05dc 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/customhttpclient.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/customhttpclient.php @@ -133,12 +133,12 @@ private function curlApiMethod($requestUrl, $options = array()) $sslVerify = isset($options['ssl_verify']) ? $options['ssl_verify'] : false; $method = isset($options['method']) ? strtoupper($options['method']) : 'GET'; $data = isset($options['post_data']) ? $options['post_data'] : array(); - $contentType = isset($options['content_type']) ? trim($options['content_type']) : 'x-www-form-urlencoded'; - $authAccessToken = isset($options['access-token']) ? trim($options['access-token']) : ''; - $sottHeaderContent = isset($options['X-LoginRadius-Sott']) ? trim($options['X-LoginRadius-Sott']) : ''; - $secretHeaderContent = isset($options['X-LoginRadius-ApiSecret']) ? trim($options['X-LoginRadius-ApiSecret']) : ''; - $expiryTime = isset($options['X-Request-Expires']) ? trim($options['X-Request-Expires']) : ''; - $digest = isset($options['digest']) ? trim($options['digest']) : ''; + $contentType = isset($options['content_type']) ? trim((string) $options['content_type']) : 'x-www-form-urlencoded'; + $authAccessToken = isset($options['access-token']) ? trim((string) $options['access-token']) : ''; + $sottHeaderContent = isset($options['X-LoginRadius-Sott']) ? trim((string) $options['X-LoginRadius-Sott']) : ''; + $secretHeaderContent = isset($options['X-LoginRadius-ApiSecret']) ? trim((string) $options['X-LoginRadius-ApiSecret']) : ''; + $expiryTime = isset($options['X-Request-Expires']) ? trim((string) $options['X-Request-Expires']) : ''; + $digest = isset($options['digest']) ? trim((string) $options['digest']) : ''; $curlHandle = curl_init(); curl_setopt($curlHandle, CURLOPT_URL, $requestUrl); @@ -203,11 +203,11 @@ private function fsockopenApiMethod($requestUrl, $options = array()){ $method = isset($options['method']) ? strtoupper($options['method']) : 'GET'; $data = isset($options['post_data']) ? $options['post_data'] : array(); $contentType = isset($options['content_type']) ? $options['content_type'] : 'form_params'; - $authAccessToken = isset($options['access-token']) ? trim($options['access-token']) : ''; - $sottHeaderContent = isset($options['X-LoginRadius-Sott']) ? trim($options['X-LoginRadius-Sott']) : ''; - $secretHeaderContent = isset($options['X-LoginRadius-ApiSecret']) ? trim($options['X-LoginRadius-ApiSecret']) : ''; - $expiryTime = isset($options['X-Request-Expires']) ? trim($options['X-Request-Expires']) : ''; - $digest = isset($options['digest']) ? trim($options['digest']) : ''; + $authAccessToken = isset($options['access-token']) ? trim((string) $options['access-token']) : ''; + $sottHeaderContent = isset($options['X-LoginRadius-Sott']) ? trim((string) $options['X-LoginRadius-Sott']) : ''; + $secretHeaderContent = isset($options['X-LoginRadius-ApiSecret']) ? trim((string) $options['X-LoginRadius-ApiSecret']) : ''; + $expiryTime = isset($options['X-Request-Expires']) ? trim((string) $options['X-Request-Expires']) : ''; + $digest = isset($options['digest']) ? trim((string) $options['digest']) : ''; $optionsArray = array('http' => array( diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.info.yml b/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.info.yml index bcaaffb..ae4434f 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.info.yml +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.info.yml @@ -3,4 +3,9 @@ type: module description: 'Allow users to sign up through a registration form. User Registration offers fully customized options for collecting and updating user data.' package: CIAM LoginRadius configure: lr_ciam.settings_form -core_version_requirement: ^9.4 || ^10 +# version: '5.2.0' +core_version_requirement: ^9 || ^10 +# Information added by Drupal.org packaging script on 2023-10-25 +version: '5.2.0' +project: 'customer_identity_and_access_management' +datestamp: 1698240101 diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.module b/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.module index 54eef01..d08bcd6 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.module +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/lr_ciam.module @@ -25,14 +25,14 @@ use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\user\UserInterface; use LoginRadiusSDK\LoginRadiusException; -module_load_include('php', 'lr_ciam', 'customhttpclient'); -module_load_include('php', 'lr_ciam', 'ciam_lang'); +\Drupal::moduleHandler()->loadInclude('lr_ciam', 'php', 'customhttpclient'); +\Drupal::moduleHandler()->loadInclude('lr_ciam', 'php', 'ciam_lang'); global $apiClientClass; $apiClientClass = 'CustomHttpClient'; $config = \Drupal::config('lr_ciam.settings'); -$api_key = trim($config->get('api_key')); -$api_secret = trim($config->get('api_secret')); +$api_key = trim((string) $config->get('api_key')); +$api_secret = trim((string) $config->get('api_secret')); $api_request_signing = $config->get('api_request_signing'); if($api_key != ''){ @@ -62,13 +62,13 @@ define('API_CONFIG_DOMAIN', 'https://config.lrcontent.com'); $secret_iv = $secretIv; $output = false; $encrypt_method = "AES-256-CBC"; - $key = hash( 'sha256', $secret_key ); - $iv = substr( hash( 'sha256', $secret_iv ), 0, 16 ); + $key = hash( 'sha256', (string) $secret_key ); + $iv = substr( hash( 'sha256', (string) $secret_iv ), 0, 16 ); if( $action == 'e' ) { $output = base64_encode( openssl_encrypt( $string, $encrypt_method, $key, 0, $iv ) ); } else if( $action == 'd' ){ - $output = openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $iv ); + $output = openssl_decrypt( base64_decode( (string) $string ), $encrypt_method, $key, 0, $iv ); } return $output; } @@ -77,7 +77,8 @@ define('API_CONFIG_DOMAIN', 'https://config.lrcontent.com'); * Implements hook_theme(). */ function lr_ciam_theme() { - $path = \Drupal::service('extension.list.module')->getPath('lr_ciam') . '/theme'; + + $path =\Drupal::service('extension.path.resolver')->getPath('module', 'lr_ciam'). '/theme'; $theme = [ 'user_login_form' => [ 'template' => 'user_login_form', @@ -209,7 +210,7 @@ function lr_ciam_theme() { */ function template_preprocess_lr_ciam_linked(&$vars) { global $base_url; - $vars['image_url'] = $base_url . '/' . \Drupal::service('extension.list.module')->getPath('lr_ciam') . '/images'; + $vars['image_url'] = $base_url . '/' . Drupal::service('extension.path.resolver')->getPath('module', 'lr_ciam'). '/images'; $vars['callback'] = lr_ciam_get_callback_url(); } @@ -218,7 +219,7 @@ function template_preprocess_lr_ciam_linked(&$vars) { */ function template_preprocess_user_pass(&$variables) { $config = \Drupal::config('lr_ciam.settings'); - $variables['api_key'] = trim($config->get('api_key')); + $variables['api_key'] = trim((string) $config->get('api_key')); $blocks = Block::loadMultiple(); foreach ($blocks as $key => $block) { @@ -245,7 +246,7 @@ function template_preprocess_user_pass(&$variables) { */ function template_preprocess_user_pass_form(&$variables) { $config = \Drupal::config('lr_ciam.settings'); - $variables['api_key'] = trim($config->get('api_key')); + $variables['api_key'] = trim((string) $config->get('api_key')); if (!\Drupal::currentUser()->isAnonymous()) { $variables['showpassonlogin'] = FALSE; $variables['rendered'] = \Drupal::service('renderer')->render($variables['form']); @@ -290,7 +291,7 @@ function template_preprocess_user_register_form(&$variables) { } $config = \Drupal::config('lr_ciam.settings'); - $variables['api_key'] = trim($config->get('api_key')); + $variables['api_key'] = trim((string) $config->get('api_key')); $variables['rendered'] = \Drupal::service('renderer')->render($variables['form']); } @@ -317,7 +318,7 @@ function template_preprocess_user_register(&$variables) { $variables['link_login'] = isset($block_settings['register_block_link_login']) ? $block_settings['register_block_link_login'] : ''; $variables['link_forgot'] = isset($block_settings['register_block_link_forgot']) ? $block_settings['register_block_link_forgot'] : ''; - $variables['api_key'] = trim($config->get('api_key')); + $variables['api_key'] = trim((string) $config->get('api_key')); $variables['rendered'] = \Drupal::service('renderer')->render($variables['form']); } @@ -328,7 +329,7 @@ function template_preprocess_user_register(&$variables) { */ function template_preprocess_user_login_form(&$variables) { $config = \Drupal::config('lr_ciam.settings'); - $variables['api_key'] = trim($config->get('api_key')); + $variables['api_key'] = trim((string) $config->get('api_key')); } /** @@ -347,7 +348,7 @@ function template_preprocess_user_login(&$variables) { } } - $variables['api_key'] = trim($config->get('api_key')); + $variables['api_key'] = trim((string) $config->get('api_key')); $variables['link_register'] = isset($block_settings['login_block_link_register']) ? $block_settings['login_block_link_register'] : ''; $variables['link_forgot'] = isset($block_settings['login_block_link_forgot']) ? $block_settings['login_block_link_forgot'] : ''; } @@ -435,10 +436,10 @@ function lr_ciam_page_attachments(&$page) { 'loggedIn' => $loggedIn, 'accessToken' => isset($access_token) ? $access_token : '', 'phoneId' => isset($lrPhoneId) ? $lrPhoneId : '', - 'appName' => trim($config->get('sso_site_name')), - 'apiKey' => trim($config->get('api_key')), - 'autoHideTime' => trim($config->get('ciam_notification_timeout_setting')), - 'appPath' => trim($sso_path), + 'appName' => trim((string) $config->get('sso_site_name')), + 'apiKey' => trim((string) $config->get('api_key')), + 'autoHideTime' => trim((string) $config->get('ciam_notification_timeout_setting')), + 'appPath' => trim((string) $sso_path), 'callback' => urldecode(lr_ciam_get_callback_url()), 'home' => Url::fromRoute('')->setAbsolute()->toString(), ]; @@ -446,9 +447,9 @@ function lr_ciam_page_attachments(&$page) { if ($config->get('ciam_terms_and_condition_html') != '') { $string = $config->get('ciam_terms_and_condition_html'); $string = str_replace(array(''), '', $string['value']); - $string = trim(str_replace('"', "'", $string)); + $string = trim((string) str_replace('"', "'", $string)); $terms = str_replace(array("\r\n", "\r", "\n"), " ", $string); - $my_settings['termsAndConditionHtml'] = trim($terms); + $my_settings['termsAndConditionHtml'] = trim((string) $terms); } if ($config->get('ciam_ask_required_fields_on_traditional_login') != '' && $config->get('ciam_ask_required_fields_on_traditional_login') != 'false') { $my_settings['askRequiredFieldForTraditionalLogin'] = (boolean) $config->get('ciam_ask_required_fields_on_traditional_login'); @@ -479,7 +480,7 @@ function lr_ciam_page_attachments(&$page) { } $configSettings = lr_ciam_get_config_option(); - if ($configSettings->IsPhoneLogin === true) { + if ( isset($configSettings) && $configSettings->IsPhoneLogin === true) { if ($config->get('ciam_check_phone_no_availability') != '' && $config->get('ciam_check_phone_no_availability') != 'false') { $my_settings['existPhoneNumber'] = (boolean) $config->get('ciam_check_phone_no_availability'); } @@ -729,7 +730,7 @@ function lr_ciam_user_insert($account) { if (isset($post_value['notify']) && $post_value['notify'] == '1') { try { $forgotVerificationUrl = Url::fromRoute('user.login')->setAbsolute()->toString(); - $result = $user_manager->lrCiamForgotPassword(trim($post_value['mail']), $forgotVerificationUrl); + $result = $user_manager->lrCiamForgotPassword(trim((string) $post_value['mail']), $forgotVerificationUrl); if (isset($result->IsPosted) && $result->IsPosted) { \Drupal::messenger()->addStatus(t('A welcome message with further instructions has been emailed to the new user %name.', [':url' => $account->url(), '%name' => $post_value['name']])); @@ -803,10 +804,10 @@ function lr_ciam_user_update($account) { if ($value == 'BirthDate') { $output[$value] = isset($post_value[$key][0]["value"]['date']) ? $post_value[$key][0]["value"]['date'] : ''; $sldate = explode('-', $output[$value]); - $year = isset($sldate[0]) ? trim($sldate[0]) : ''; - $month = isset($sldate[1]) ? trim($sldate[1]) : ''; - $date = isset($sldate[2]) ? trim($sldate[2]) : ''; - $formatDate = trim($month . '-' . $date . '-' . $year); + $year = isset($sldate[0]) ? trim((string) $sldate[0]) : ''; + $month = isset($sldate[1]) ? trim((string) $sldate[1]) : ''; + $date = isset($sldate[2]) ? trim((string) $sldate[2]) : ''; + $formatDate = trim((string) $month . '-' . $date . '-' . $year); $output[$value] = $formatDate; } else { @@ -955,7 +956,7 @@ if (!in_array("administrator", $user) && !\Drupal::currentUser()->isAnonymous()) $mfaObject = new MultiFactorAuthenticationAPI(); try { - $res = $socialObject->validateAccessToken(trim(\Drupal::service('session')->get('access_token', ''))); + $res = $socialObject->validateAccessToken(trim((string) \Drupal::service('session')->get('access_token', []))); if (isset($res->errorCode) && $res->errorCode == '906') { $domain = Url::fromRoute('')->setAbsolute()->toString(); @@ -1136,7 +1137,7 @@ if (!in_array("administrator", $user) && !\Drupal::currentUser()->isAnonymous()) if (isset($configSettings->TwoFactorAuthentication) && $configSettings->TwoFactorAuthentication->IsEnabled) { $authenticationAPI = new AuthenticationAPI(); try { - $userProfileData = $authenticationAPI->getProfileByAccessToken(trim(\Drupal::service('session')->get('access_token', [])),'Provider'); + $userProfileData = $authenticationAPI->getProfileByAccessToken(trim((string) \Drupal::service('session')->get('access_token', [])),'Provider'); } catch (LoginRadiusException $e) { \Drupal::logger('ciam')->error($e); diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/CiamUserManager.php b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/CiamUserManager.php index 052164a..44fbc9f 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/CiamUserManager.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/CiamUserManager.php @@ -32,9 +32,9 @@ class CiamUserManager { public function __construct() { $this->connection = Database::getConnection(); $this->moduleconfig = \Drupal::config('lr_ciam.settings'); - $this->apiSecret = trim($this->moduleconfig->get('api_secret')); - $this->apiKey = trim($this->moduleconfig->get('api_key')); - $this->apirequestsigning = trim($this->moduleconfig->get('api_request_signing')); + $this->apiSecret = trim((string) $this->moduleconfig->get('api_secret')); + $this->apiKey = trim((string) $this->moduleconfig->get('api_key')); + $this->apirequestsigning = trim((string) $this->moduleconfig->get('api_request_signing')); $this->redirectMiddleware = \Drupal::service('lr_ciam.http_middleware'); } @@ -207,12 +207,11 @@ public function removeUnescapedChar($str) { ',', ], [''], $str); $cur_encoding = mb_detect_encoding($in_str); - if ($cur_encoding == "UTF-8" && mb_check_encoding($in_str, "UTF-8")) { return $in_str; } else { - return utf8_encode($in_str); + return mb_convert_encoding($in_str,"UTF-8"); } } @@ -528,7 +527,7 @@ public function downloadProfilePic($picture_url, $id, $user) { $request = @file_get_contents($picture_url); if ($request) { // $picture_file_data = file_save_data($request, $destination, FILE_EXISTS_REPLACE); - $picture_file_data = \Drupal::service('file.repository')->writeData($request, $destination, FileSystemInterface::EXISTS_REPLACE); + $picture_file_data = file_save_data($request, $destination, FileSystemInterface::EXISTS_REPLACE); $maxResolution = $picture_config->get('settings.max_resolution'); $minResolution = $picture_config->get('settings.min_resolution'); file_validate_image_resolution($picture_file_data, $maxResolution, $minResolution); @@ -563,7 +562,7 @@ public function createUser($userprofile) { } $data = $this->checkUserName($userprofile); // Set up the user fields. - $password = \Drupal::service('password_generator')->generate(32); + $password = \Drupal::service('password_generator')->generate(32); $fields = [ 'name' => ($this->moduleconfig->get('ciam_save_name_in_db') == 'false') ? $userprofile->ID : $data['username'], @@ -595,7 +594,7 @@ public function createUser($userprofile) { $this->downloadProfilePic($userprofile->ImageUrl, $userprofile->ID, $new_user); // Advanced module LR Code Hook Start. - if (count(\Drupal::moduleHandler()->getImplementations('add_user_data_after_save')) > 0) { + if (\Drupal::moduleHandler()->hasImplementations('add_user_data_after_save')) { // Call all modules that implement the hook, and let them make changes to $variables. \Drupal::moduleHandler()->invokeAll('add_user_data_after_save', [$new_user, $userprofile]); } @@ -606,7 +605,6 @@ public function createUser($userprofile) { } if ($new_user->isActive() && $status && \Drupal::service('session')->get('user_verify', []) != 1) { - // $new_user->setLastLoginTime(REQUEST_TIME); $new_user->setLastLoginTime(\Drupal::time()->getRequestTime()); } } @@ -941,7 +939,7 @@ public function fieldFieldConvertList($property_name, $userprofile, $field, $ins foreach ($options as $key => $option) { - $option = trim($option); + $option = trim((string) $option); $match_option = strtolower($option); $this_match = 0; similar_text($match_option, $match_sl, $this_match); @@ -982,10 +980,10 @@ public function fieldFieldConvertDate($property_name, $userprofile, $field, $ins } else { $sldate = explode('-', $userprofile->$property_name); - $month = isset($sldate[0]) ? trim($sldate[0]) : ''; - $date = isset($sldate[1]) ? trim($sldate[1]) : ''; - $year = isset($sldate[2]) ? trim($sldate[2]) : ''; - $formatDate = trim($year . '-' . $month . '-' . $date, '-'); + $month = isset($sldate[0]) ? trim((string) $sldate[0]) : ''; + $date = isset($sldate[1]) ? trim((string) $sldate[1]) : ''; + $year = isset($sldate[2]) ? trim((string) $sldate[2]) : ''; + $formatDate = trim((string) $year . '-' . $month . '-' . $date, '-'); $formatDate = $formatDate . 'T00:00:00'; } diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Controller/CiamController.php b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Controller/CiamController.php index cda5424..f62f949 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Controller/CiamController.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Controller/CiamController.php @@ -142,7 +142,6 @@ public function changePasswordAccess() { * Handle token and validate the user. */ public function userRegisterValidate() { - $action = \Drupal::request()->query->get('action_completed'); if (isset($action) && $action == 'register') { $this->messenger()->addStatus($this->t('Email for verification has been sent to your provided email id, check email for further instructions')); @@ -153,10 +152,9 @@ public function userRegisterValidate() { $this->messenger()->addStatus($this->t('Password reset information sent to your provided email id, check email for further instructions')); return $this->redirect(""); } - - $request_token = isset($_REQUEST['token']) ? trim($_REQUEST['token']) : ''; - if (isset($_REQUEST['token'])) { - + $request_token =isset(\Drupal::request()->request->all()["token"])?\Drupal::request()->request->all()["token"]:trim((string) \Drupal::request()->query->get('token')); + if (isset($request_token)) { + $authObject = new AuthenticationAPI(); \Drupal::service('session')->set('access_token', $request_token); @@ -179,7 +177,7 @@ public function userRegisterValidate() { // Advanced module LR Code Hook Start. // Make sure at least one module implements our hook. - if (count(\Drupal::moduleHandler()->getImplementations('add_loginradius_userdata')) > 0) { + if (\Drupal::moduleHandler()->hasImplementations('add_loginradius_userdata')) { // Call all modules that implement the hook, and let them. // Make changes to $variables. $result = \Drupal::moduleHandler()->invokeAll('add_loginradius_userdata', [$userprofile, $userprofile->widget_token]); @@ -208,6 +206,7 @@ public function userRegisterValidate() { return $this->usermanager->provideLogin($drupal_user, $userprofile); } } + return $this->usermanager->checkExistingUser($userprofile); } else { diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AdvancedSettingsForm.php b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AdvancedSettingsForm.php index 04e592f..04e02e3 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AdvancedSettingsForm.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AdvancedSettingsForm.php @@ -9,6 +9,7 @@ use Drupal\Core\Cache\Cache; use LoginRadiusSDK\CustomerRegistration\Advanced\ConfigurationAPI; use LoginRadiusSDK\Utility\Functions; +use LoginRadiusSDK\LoginRadiusException; /** * Displays the advanced settings form. @@ -34,8 +35,8 @@ public function getFormId() { */ public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('lr_ciam.settings'); - $apiKey = trim($config->get('api_key')); - $apiSecret = trim($config->get('api_secret')); + $apiKey = trim((string) $config->get('api_key')); + $apiSecret = trim((string) $config->get('api_secret')); // Configuration of which forms to protect, with what challenge. if (isset($apiKey) && $apiKey != '' && isset($apiSecret) && $apiSecret != '') { try { @@ -79,37 +80,36 @@ public function buildForm(array $form, FormStateInterface $form_state) { 'false' => $this->t('No'), ], ]; - - if (isset($configOptions) && $configOptions->IsInstantSignin->EmailLink) { - $form['lr_advanced_settings']['ciam_instant_link_login_email_template'] = [ - '#type' => 'select', - '#title' => $this->t('Passwordless link login email template (?)'), - '#options' => $this->getEmailTemplate($email_templates->EmailTemplates->InstantSignIn), - '#default_value' => $config->get('ciam_instant_link_login_email_template'), - ]; - } - - if (isset($configOptions) && $configOptions->IsPhoneLogin) { - $form['lr_advanced_settings']['ciam_instant_otp_login'] = [ - '#type' => 'radios', - '#title' => $this->t('Enable passwordless OTP login (?)'), - '#default_value' => $config->get('ciam_instant_otp_login') ? $config->get('ciam_instant_otp_login') : 'false', - '#options' => [ - 'true' => $this->t('Yes'), - 'false' => $this->t('No'), - ], - ]; - - if (isset($configOptions) && $configOptions->IsInstantSignin->SmsOtp) { - $form['lr_advanced_settings']['ciam_sms_template_one_time_passcode'] = [ - '#type' => 'select', - '#title' => $this->t('Passwordless OTP login SMS template (?)'), - '#options' => $this->getEmailTemplate($email_templates->SMSTemplates->OneTimePassCode), - '#default_value' => $config->get('ciam_sms_template_one_time_passcode'), - ]; + if(isset($email_templates)){ + if (isset($configOptions) && $configOptions->IsInstantSignin->EmailLink) { + $form['lr_advanced_settings']['ciam_instant_link_login_email_template'] = [ + '#type' => 'select', + '#title' => $this->t('Passwordless link login email template (?)'), + '#options' => $this->getEmailTemplate($email_templates->EmailTemplates->InstantSignIn), + '#default_value' => $config->get('ciam_instant_link_login_email_template'), + ]; + } + if (isset($configOptions) && $configOptions->IsPhoneLogin) { + $form['lr_advanced_settings']['ciam_instant_otp_login'] = [ + '#type' => 'radios', + '#title' => $this->t('Enable passwordless OTP login (?)'), + '#default_value' => $config->get('ciam_instant_otp_login') ? $config->get('ciam_instant_otp_login') : 'false', + '#options' => [ + 'true' => $this->t('Yes'), + 'false' => $this->t('No'), + ], + ]; + + if (isset($configOptions) && $configOptions->IsInstantSignin->SmsOtp) { + $form['lr_advanced_settings']['ciam_sms_template_one_time_passcode'] = [ + '#type' => 'select', + '#title' => $this->t('Passwordless OTP login SMS template (?)'), + '#options' => $this->getEmailTemplate($email_templates->SMSTemplates->OneTimePassCode), + '#default_value' => $config->get('ciam_sms_template_one_time_passcode'), + ]; + } + } } - } - $form['lr_advanced_settings']['ciam_display_password_strength'] = [ '#type' => 'radios', '#title' => $this->t('Enable password strength (?)'), @@ -235,7 +235,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { Database::getConnection()->delete('config') ->condition('name', 'lr_ciam.settings')->execute(); - if (count(\Drupal::moduleHandler()->getImplementations('add_advance_config_settings')) > 0) { + if (\Drupal::moduleHandler()->hasImplementations('add_advance_config_settings')) { // Call all modules that implement the hook, // and let them make changes to $variables. $data = \Drupal::moduleHandler()->invokeAll('add_advance_config_settings'); diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AuthenticationSettingsForm.php b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AuthenticationSettingsForm.php index 4eb85d3..8817158 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AuthenticationSettingsForm.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/Form/AuthenticationSettingsForm.php @@ -8,6 +8,7 @@ use Drupal\field\Entity\FieldStorageConfig; use Drupal\Core\Cache\Cache; use LoginRadiusSDK\CustomerRegistration\Advanced\ConfigurationAPI; +use LoginRadiusSDK\LoginRadiusException; use LoginRadiusSDK\Utility\Functions; /** @@ -34,8 +35,8 @@ public function getFormId() { */ public function buildForm(array $form, FormStateInterface $form_state) { $config = $this->config('lr_ciam.settings'); - $apiKey = trim($config->get('api_key')); - $apiSecret = trim($config->get('api_secret')); + $apiKey = trim((string) $config->get('api_key')); + $apiSecret = trim((string) $config->get('api_secret')); // Configuration of which forms to protect, with what challenge. if (isset($apiKey) && $apiKey != '' && isset($apiSecret) && $apiSecret != '') { try { @@ -129,7 +130,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 'false' => $this->t('No'), ], ]; - if (isset($email_templates->EmailTemplates)) { + if (isset($email_templates) && isset($email_templates->EmailTemplates)) { $form['lr_email_auth_settings']['ciam_welcome_email_template'] = [ '#title' => $this->t('Welcome email template (?)'), '#type' => 'select', @@ -148,7 +149,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#options' => $this->getEmailTemplate($email_templates->EmailTemplates->ResetPassword), '#default_value' => $config->get('ciam_reset_password_email_template'), ]; - if (isset($configOptions) && $configOptions->TwoFactorAuthentication->IsEnabled) { + if (isset($configOptions) && $configOptions->TwoFactorAuthentication->IsEnabled && isset($email_templates->SMSTemplates)) { $form['lr_email_auth_settings']['ciam_sms_template_2fa'] = [ '#type' => 'select', '#title' => $this->t('Two-factor authentication SMS template (?)'), @@ -158,7 +159,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { } } - if (isset($configOptions) && $configOptions->IsPhoneLogin) { + if (isset($configOptions) && $configOptions->IsPhoneLogin && isset($email_templates) && isset($email_templates->SMSTemplates)) { $form['lr_phone_auth_settings'] = [ '#type' => 'details', '#title' => $this->t('Phone Authentication Settings'), @@ -285,9 +286,10 @@ public function getEmailTemplate($template_array) { * Get fields for mapping. */ public function fieldUserProperties() { + $common = []; $config = $this->config('lr_ciam.settings'); - $apiKey = trim($config->get('api_key')); - $apiSecret = trim($config->get('api_secret')); + $apiKey = trim((string) $config->get('api_key')); + $apiSecret = trim((string) $config->get('api_secret')); if (isset($apiKey) && $apiKey != '' && isset($apiSecret) && $apiSecret != '') { try { $configObject = new ConfigurationAPI(); @@ -297,7 +299,7 @@ public function fieldUserProperties() { \Drupal::logger('ciam')->error($e); } - $common = []; + if(isset($configOptions->RegistrationFormSchema)){ foreach($configOptions->RegistrationFormSchema as $key => $val){ @@ -353,7 +355,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { ->set('login_redirection', $form_state->getValue('login_redirection')) ->set('custom_login_url', $form_state->getValue('custom_login_url')) ->save(); - if (count(\Drupal::moduleHandler()->getImplementations('add_extra_config_settings')) > 0) { + if (\Drupal::moduleHandler()->hasImplementations('add_extra_config_settings')) { // Call all modules that implement the hook, // and let them make changes to $variables. $data = \Drupal::moduleHandler()->invokeAll('add_extra_config_settings'); diff --git a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/RedirectMiddleware.php b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/RedirectMiddleware.php index ce91daa..82fd2d0 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/RedirectMiddleware.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_ciam/src/RedirectMiddleware.php @@ -17,14 +17,14 @@ class RedirectMiddleware implements HttpKernelInterface { /** * The wrapped HTTP kernel. * - * @var HttpKernelInterface + * @var \Symfony\Component\HttpKernel\HttpKernelInterface */ protected $httpKernel; /** * The redirect URL. * - * @var RedirectResponse + * @var \Symfony\Component\HttpFoundation\RedirectResponse */ protected $redirectResponse; @@ -32,7 +32,7 @@ class RedirectMiddleware implements HttpKernelInterface { * Constructs a RedirectMiddleware * object. * - * @param HttpKernelInterface $http_kernel + * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel * The decorated kernel. */ public function __construct(HttpKernelInterface $http_kernel) { @@ -42,7 +42,7 @@ public function __construct(HttpKernelInterface $http_kernel) { /** * {@inheritdoc} */ - public function handle(Request $request, int $type = self::MAIN_REQUEST, bool $catch = true): Response { + public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TRUE): Response { $response = $this->httpKernel->handle($request, $type, $catch); return $this->redirectResponse ?: $response; } @@ -50,11 +50,11 @@ public function handle(Request $request, int $type = self::MAIN_REQUEST, bool $c /** * Stores the requested redirect response. * - * @param RedirectResponse|null $redirectResponse + * @param \Symfony\Component\HttpFoundation\RedirectResponse|null $redirectResponse * Redirect response. */ public function setRedirectResponse(?RedirectResponse $redirectResponse) { $this->redirectResponse = $redirectResponse; } -} +} \ No newline at end of file diff --git a/drupal-10/src/customer_identity_and_access_management/lr_identity_experience_framework/lr_identity_experience_framework.info.yml b/drupal-10/src/customer_identity_and_access_management/lr_identity_experience_framework/lr_identity_experience_framework.info.yml index 4d53461..5b8f601 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_identity_experience_framework/lr_identity_experience_framework.info.yml +++ b/drupal-10/src/customer_identity_and_access_management/lr_identity_experience_framework/lr_identity_experience_framework.info.yml @@ -5,6 +5,11 @@ package: CIAM LoginRadius dependencies: - drupal:lr_ciam configure: lr_identity_experience_framework.settings_form -version: '5.1.2' -core_version_requirement: ^9.4 || ^10 +# version: '5.2.0' +core_version_requirement: ^9 || ^10 +# project: 'customer_identity_and_access_management' + +# Information added by Drupal.org packaging script on 2023-10-25 +version: '5.2.0' project: 'customer_identity_and_access_management' +datestamp: 1698240101 diff --git a/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/lr_simple_oauth.info.yml b/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/lr_simple_oauth.info.yml index 5b2ee42..204484d 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/lr_simple_oauth.info.yml +++ b/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/lr_simple_oauth.info.yml @@ -5,4 +5,11 @@ package: CIAM LoginRadius dependencies: - drupal:lr_ciam - drupal:simple_oauth -core_version_requirement: ^9.4 || ^10 +# version: '5.2.0' +core_version_requirement: ^9 || ^10 +# project: 'customer_identity_and_access_management' + +# Information added by Drupal.org packaging script on 2023-10-25 +version: '5.2.0' +project: 'customer_identity_and_access_management' +datestamp: 1698240101 diff --git a/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/src/UserAuth.php b/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/src/UserAuth.php index 3ceabbb..24793a0 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/src/UserAuth.php +++ b/drupal-10/src/customer_identity_and_access_management/lr_simple_oauth/src/UserAuth.php @@ -21,8 +21,8 @@ class UserAuth implements UserAuthInterface { */ public function __construct() { $this->moduleconfig = \Drupal::config('lr_ciam.settings'); - $this->apiKey = trim($this->moduleconfig->get('api_key')); - $this->apiSecret = trim($this->moduleconfig->get('api_secret')); + $this->apiKey = trim((string) $this->moduleconfig->get('api_key')); + $this->apiSecret = trim((string) $this->moduleconfig->get('api_secret')); } /** diff --git a/drupal-10/src/customer_identity_and_access_management/lr_sso/lr_sso.info.yml b/drupal-10/src/customer_identity_and_access_management/lr_sso/lr_sso.info.yml index af2f3c4..7cf6d6e 100644 --- a/drupal-10/src/customer_identity_and_access_management/lr_sso/lr_sso.info.yml +++ b/drupal-10/src/customer_identity_and_access_management/lr_sso/lr_sso.info.yml @@ -5,4 +5,11 @@ package: CIAM LoginRadius dependencies: - drupal:lr_ciam configure: lr_sso.settings_form -core_version_requirement: ^9.4 || ^10 +# version: '5.2.0' +core_version_requirement: ^9 || ^10 +# project: 'customer_identity_and_access_management' + +# Information added by Drupal.org packaging script on 2023-10-25 +version: '5.2.0' +project: 'customer_identity_and_access_management' +datestamp: 1698240101