diff --git a/composer.json b/composer.json
index 012361b5f09f7dafb7a331a9bad7d5966e1678cd..f96e53e074fc48bf2ec4982b52e6d69931842478 100644
--- a/composer.json
+++ b/composer.json
@@ -130,6 +130,7 @@
"drupal/redis": "1.0-rc2",
"drupal/reroute_email": "1.0",
"drupal/responsive_menu": "2.5",
+ "drupal/roleassign": "^1.0@alpha",
"drupal/scheduler": "1.0",
"drupal/search_api": "1.1",
"drupal/search_api_db": "1.1",
diff --git a/composer.lock b/composer.lock
index ce92533d8c7a92c0a4299e167907150e3a64d0a2..8a515dc528910b628d6d5860cdf21a6fc0b9237e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "1e26c9a92826825ab166954dbef61674",
+ "content-hash": "8f8055782dc9f901b7cfe9b2a7c0ba22",
"packages": [
{
"name": "alchemy/zippy",
@@ -5542,6 +5542,53 @@
"issues": "https://drupal.org/project/issues/responsive_menu"
}
},
+ {
+ "name": "drupal/roleassign",
+ "version": "1.0.0-alpha2",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupal.org/project/roleassign",
+ "reference": "8.x-1.0-alpha2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/roleassign-8.x-1.0-alpha2.zip",
+ "reference": "8.x-1.0-alpha2",
+ "shasum": "e2c4cb24dd1bce59f4edcb3488377d2b12769136"
+ },
+ "require": {
+ "drupal/core": "~8.0"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "branch-alias": {
+ "dev-1.x": "1.x-dev"
+ },
+ "drupal": {
+ "version": "8.x-1.0-alpha2",
+ "datestamp": "1454394539",
+ "security-coverage": {
+ "status": "not-covered",
+ "message": "Alpha releases are not covered by Drupal security advisories."
+ }
+ }
+ },
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "salvis",
+ "homepage": "https://www.drupal.org/user/82964"
+ }
+ ],
+ "description": "Allows site administrators to further delegate the task of managing user's roles.",
+ "homepage": "https://www.drupal.org/project/roleassign",
+ "support": {
+ "source": "http://cgit.drupalcode.org/roleassign"
+ }
+ },
{
"name": "drupal/scheduler",
"version": "1.0.0",
@@ -10837,6 +10884,7 @@
"stability-flags": {
"drupal/adminimal_theme": 20,
"drupal/calendar": 20,
+ "drupal/roleassign": 15,
"drupal/simple_block": 10,
"drupal/views_bootstrap": 20
},
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index d218a3cebe61ec56562aeb4df065f63851d71d71..a1f844870609d3cec4502196e2bb42b089b8b22c 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -5714,6 +5714,55 @@
"issues": "https://drupal.org/project/issues/responsive_menu"
}
},
+ {
+ "name": "drupal/roleassign",
+ "version": "1.0.0-alpha2",
+ "version_normalized": "1.0.0.0-alpha2",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupal.org/project/roleassign",
+ "reference": "8.x-1.0-alpha2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/roleassign-8.x-1.0-alpha2.zip",
+ "reference": "8.x-1.0-alpha2",
+ "shasum": "e2c4cb24dd1bce59f4edcb3488377d2b12769136"
+ },
+ "require": {
+ "drupal/core": "~8.0"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "branch-alias": {
+ "dev-1.x": "1.x-dev"
+ },
+ "drupal": {
+ "version": "8.x-1.0-alpha2",
+ "datestamp": "1454394539",
+ "security-coverage": {
+ "status": "not-covered",
+ "message": "Alpha releases are not covered by Drupal security advisories."
+ }
+ }
+ },
+ "installation-source": "dist",
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "salvis",
+ "homepage": "https://www.drupal.org/user/82964"
+ }
+ ],
+ "description": "Allows site administrators to further delegate the task of managing user's roles.",
+ "homepage": "https://www.drupal.org/project/roleassign",
+ "support": {
+ "source": "http://cgit.drupalcode.org/roleassign"
+ }
+ },
{
"name": "drupal/scheduler",
"version": "1.0.0",
diff --git a/web/modules/roleassign/CHANGELOG.txt b/web/modules/roleassign/CHANGELOG.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b15ace8694b1d505038a0f2539ba3e220a7e7385
--- /dev/null
+++ b/web/modules/roleassign/CHANGELOG.txt
@@ -0,0 +1,52 @@
+
+CHANGELOG for RoleAssign for Drupal 8
+
+
+roleassign 8.x-1.x-dev:
+
+
+roleassign 8.x-1.0-alpha2 (2016-02-02):
+ Issue #2657668 by salvis, svendecabooter: Avoid uninitialized $assigned_roles variable.
+ Issue #2658028 by svendecabooter: Provide default values for config entity.
+
+
+roleassign 8.x-1.0-alpha1 (2015-11-25):
+ Issue #2405341 by svendecabooter, tkuldeep17, salvis: Initial port to D8.
+ Issue #2405341: Branch to port to D8.
+
+roleassign 7.x-1.x-dev:
+ #2050711: Update README.txt to clarify the risk posed by the 'administer users' permission.
+
+roleassign 7.x-1.0 (2012-11-04):
+
+roleassign 7.x-1.0-rc2 (2012-10-17):
+ #1402408: Ensure that hook_user_presave() is always registered.
+ #1431338: Clarify the configuration instructions.
+ #1386064: Fix a notice in the bulk user administration hook.
+ Tune the module-uninstall protection.
+
+roleassign 7.x-1.0-rc1 (2011-11-26):
+ Clean up type hints, docblocks, comments and some minor code issues.
+
+roleassign 7.x-1.0-beta2 (2011-09-05):
+ Protect more-privileged users as well as RoleAssign itself.
+ #1258808: Fix a warning in _roleassign_form_alter().
+
+roleassign 7.x-1.0-beta1 (2011-08-11):
+ Port to D7 and extract roleassign.admin.inc to reduce the footprint.
+
+
+roleassign 6.x-1.0 (2011-08-11):
+
+roleassign 6.x-1.0-rc1 (2011-07-20):
+ Remove unnecessary quotes from the .info file.
+ Avoid two 'undefined index' notices.
+ #599440 by shark: Keep permission names in help text visible for light-on-dark themes.
+ Minor coding style and porting clean-up.
+ 'administer access control' is called 'administer permissions' in D6.
+ Maintainership passed to salvis.
+ Minor code cleanup, by TBarregren.
+
+roleassign 6.x-1.0-beta3 (2010-10-09):
+ Last release by TBarregren.
+
diff --git a/web/modules/roleassign/LICENSE.txt b/web/modules/roleassign/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d159169d1050894d3ea3b98e1c965c4058208fe1
--- /dev/null
+++ b/web/modules/roleassign/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.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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.
+
+ <signature of Ty Coon>, 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/web/modules/roleassign/README.txt b/web/modules/roleassign/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..23306c1b374d7b4c9f205ed058ce5168df98d9bb
--- /dev/null
+++ b/web/modules/roleassign/README.txt
@@ -0,0 +1,84 @@
+ROLEASSIGN
+==========
+
+RoleAssign specifically allows site administrators to further delegate
+the task of managing user's roles.
+
+RoleAssign introduces a new permission called 'assign roles'. Users
+with this permission are able to assign selected roles to still other
+users. Only users with the 'administer permissions' permission may
+select which roles are available for assignment through this module.
+
+This module was developped by TBarregren and is now maintained by salvis.
+Drupal 7 port by salvis.
+Drupal 8 port by svendecabooter and tkuldeep17.
+
+
+BACKGROUND
+----------
+
+It is possible for site administrators to delegate the user
+administration through the 'administer users' permission. But that
+doesn't include the right to assign roles to users. That is necessary if
+the delegatee should be able to administrate user accounts without
+intervention from a site administrator.
+
+To delegate the assignment of roles, site administrators have had until
+now no other choice than also grant the 'administer permissions'
+permission. But that is not advisable, since it gives right to access
+all roles, and worse, to grant any rights to any role. That can be
+abused by the delegatee, who can assign himself all rights and thereby
+take control over the site.
+
+This module solves this dilemma by introducing the 'assign roles'
+permission. While editing a user's account information, a user with this
+permission will be able to select roles for the user from a set of
+available roles. Roles available are configured by users with the
+'administer permissions' permission.
+
+
+INSTALL
+-------
+
+1. Copy the entire 'roleassign' directory, containing the
+'roleassign.module' and other files, to your Drupal modules directory.
+
+2. Log in as site administrator.
+
+3. Go to the administration page for modules and enable the module.
+
+
+CONFIGURATION
+-------------
+
+1. Log in as site administrator.
+
+2. Go to the Permissions page (people/permissions) and grant the 'assign roles'
+permission to those roles that should be able to assign roles to other users.
+Notice that besides the 'assign roles' permission, these roles also must have
+the 'administer users' permission.
+
+3. Go to the administration page for RoleAssign (people/permissions/roleassign)
+and select those roles that should be available for assignment by users with
+'assign roles' permission.
+
+4. For each user that should be able to assign roles, go to the user's account
+and select a role with both the 'assign roles' and the 'administer users'
+permissions.
+
+Beware: Granting the 'administer users' permission to users will allow them to
+modify admin passwords or email addresses. The User Protect module can help to
+prevent this. RoleAssign will protect user 1's name, email, and password fields,
+but it won't protect any other accounts.
+
+
+USAGE
+-----
+
+1. Log in as a user with both the 'assign roles' and the 'administer users'
+permissions.
+
+2. To change the roles of a user, go to the user's account and review the
+assignable roles and change them as necessary.
+
+
diff --git a/web/modules/roleassign/config/install/roleassign.settings.yml b/web/modules/roleassign/config/install/roleassign.settings.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b76361f2663fa58959335c5ecb8d1ebe4fe998ba
--- /dev/null
+++ b/web/modules/roleassign/config/install/roleassign.settings.yml
@@ -0,0 +1 @@
+roleassign_roles: []
diff --git a/web/modules/roleassign/config/schema/roleassign.schema.yml b/web/modules/roleassign/config/schema/roleassign.schema.yml
new file mode 100644
index 0000000000000000000000000000000000000000..02bbd9a26116705aa1f677f7466c6a67ee176bb8
--- /dev/null
+++ b/web/modules/roleassign/config/schema/roleassign.schema.yml
@@ -0,0 +1,12 @@
+# Schema for the configuration files of roleassign module.
+
+roleassign.settings:
+ type: config_object
+ label: 'Roles'
+ mapping:
+ roleassign_roles:
+ type: sequence
+ label: 'Select roles that should be available for assignment'
+ sequence:
+ type: string
+ label: 'role'
diff --git a/web/modules/roleassign/migration_templates/d6_roleassign_settings.yml b/web/modules/roleassign/migration_templates/d6_roleassign_settings.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2d88c1934834834e7d0b7f54b8069dc63839980b
--- /dev/null
+++ b/web/modules/roleassign/migration_templates/d6_roleassign_settings.yml
@@ -0,0 +1,19 @@
+id: d6_roleassign_settings
+label: RoleAssign settings
+migration_tags:
+ - Drupal 6
+source:
+ plugin: variable
+ variables:
+ - roleassign_roles
+process:
+ roleassign_roles:
+ plugin: migration
+ migration: d6_user_role
+ source: roleassign_roles
+destination:
+ plugin: config
+ config_name: roleassign.settings
+migration_dependencies:
+ required:
+ - d6_user_role
diff --git a/web/modules/roleassign/migration_templates/d7_roleassign_settings.yml b/web/modules/roleassign/migration_templates/d7_roleassign_settings.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a19edde0d260d22d0f2d163201751ccda6a308f3
--- /dev/null
+++ b/web/modules/roleassign/migration_templates/d7_roleassign_settings.yml
@@ -0,0 +1,19 @@
+id: d7_roleassign_settings
+label: RoleAssign settings
+migration_tags:
+ - Drupal 7
+source:
+ plugin: variable
+ variables:
+ - roleassign_roles
+process:
+ roleassign_roles:
+ plugin: migration
+ migration: d7_user_role
+ source: roleassign_roles
+destination:
+ plugin: config
+ config_name: roleassign.settings
+migration_dependencies:
+ required:
+ - d7_user_role
diff --git a/web/modules/roleassign/roleassign.info.yml b/web/modules/roleassign/roleassign.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..dc0bd1cb8c9f819f511673ecb12833076e9df1b7
--- /dev/null
+++ b/web/modules/roleassign/roleassign.info.yml
@@ -0,0 +1,11 @@
+name: RoleAssign
+description: 'Allows site administrators to further delegate the task of managing user''s roles.'
+# core: 8.x
+type: module
+configure: roleassign.settings
+
+# Information added by Drupal.org packaging script on 2016-02-02
+version: '8.x-1.0-alpha2'
+core: '8.x'
+project: 'roleassign'
+datestamp: 1454396974
diff --git a/web/modules/roleassign/roleassign.links.menu.yml b/web/modules/roleassign/roleassign.links.menu.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f7c5b6e835e03f6b0c38948cc403cf8c1888eb3f
--- /dev/null
+++ b/web/modules/roleassign/roleassign.links.menu.yml
@@ -0,0 +1,7 @@
+roleassign.settings:
+ title: 'RoleAssign settings'
+ parent: user.admin_index
+ description: "Configuration settings to further delegate the task of managing user's roles."
+ weight: -8
+ route_name: roleassign.settings
+ menu_name: admin
diff --git a/web/modules/roleassign/roleassign.module b/web/modules/roleassign/roleassign.module
new file mode 100644
index 0000000000000000000000000000000000000000..cc418cb4bb6320d508dbffaa40ecdea60ee99d4f
--- /dev/null
+++ b/web/modules/roleassign/roleassign.module
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * @file
+ * Allows site administrators to further delegate the task of managing user's
+ * roles.
+ */
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\user\RoleInterface;
+
+/**
+ * Implements hook_help().
+ */
+function roleassign_help($route_name, RouteMatchInterface $route_match) {
+ $permissions = \Drupal::service('user.permissions')->getPermissions();
+ switch ($route_name) {
+ case 'help.page.roleassign':
+ return t('
+ <p>RoleAssign specifically allows site administrators to further delegate the task of managing user\'s roles.</p>
+ <p>RoleAssign introduces a new permission called Assign roles. Users with this permission are able to assign selected roles to still other users. Only users with the Administer permissions permission may select which roles are available for assignment through this module.</p>
+ <!--break-->
+ <h2>Background</h2>
+ <p>It is possible for site administrators to delegate the user administration through the Administer users permission. But that doesn\'t include the right to assign roles to users. That is necessary if the delegatee should be able to administrate user accounts without intervention from a site administrator.</p>
+ <p>To delegate the assignment of roles, site administrators have had until now no other choice than also grant the Administer permissions permission. But that is not advisable, since it gives right to access all roles, and worse, to grant any rights to any role. That can be abused by the delegatee, who can assign himself all rights and thereby take control over the site.</p>
+ <p>This module solves this dilemma by introducing the Assign roles permission. While editing a user\'s account information, a user with this permission will be able to select roles for the user from a set of available roles. Roles available are configured by users with the Administer permissions permission.</p>
+ <h2>Configuration</h2>
+ <ol>
+ <li>Log in as site administrator.</li>
+ <li>Go to the administration page for access control and grant Assign roles permission to those roles that should be able to assign roles to other users. Notice that besides the Assign roles permission, these roles also must have the Administer users permission.</li>
+ <li>Go to the administration page for role assign and select those roles that should be available for assignment by users with Assign roles permission.</li>
+ <li>For each user that should be able to assign roles, go to the user\'s account and select a role with both the Assign roles and the Administer users permissions.</li>
+ </ol>
+ <p><strong>Beware:</strong> granting Administer users permission to users will allow them to modify admin passwords or email addresses or even delete the site administrator account. The <a href=":user_protect">User protect</a> module can prevent this.</p>
+ <h2>Usage</h2>
+ <ol>
+ <li>Log in as a user with both the Assign roles and the Administer users permissions.</li>
+ <li>To change the roles of a user, go to the user\'s account and review the assignable roles and change them as necessary.</li>
+ </ol>', array(
+ ':user_protect' => 'http://drupal.org/project/userprotect',
+ )
+ );
+ case 'roleassign.settings':
+ return t('Users with both %administer_users and %assign_roles permissions are allowed to assign the roles selected below. For more information, see the <a href=":help">help page</a>.', array('%administer_users' => $permissions['administer users']['title'], '%assign_roles' => $permissions['assign roles']['title'], ':help' => \Drupal::url('help.page', array ('name' => 'roleassign'))));
+ }
+}
+
+/**
+ * Specify whether the current user should be restricted in the roles he/she can
+ * assign - as set by the RoleAssign configuration.
+ *
+ * @return bool
+ */
+function roleassign_restrict_access() {
+ $restrict_access = TRUE;
+ // Do nothing if the user already has 'administer permissions' permission.
+ if (\Drupal::currentUser()->hasPermission('administer permissions')) {
+ $restrict_access = FALSE;
+ }
+
+ // Do nothing if the user doesn't have both 'administer users' and
+ // 'assign roles' permissions.
+ if (!\Drupal::currentUser()->hasPermission('administer users') || !\Drupal::currentUser()->hasPermission('assign roles')) {
+ $restrict_access = FALSE;
+ }
+
+ return $restrict_access;
+}
+
+/**
+ * Implements hook_form_alter().
+ */
+function roleassign_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+ if (roleassign_restrict_access()) {
+ // Add the checkboxes to the user register and user edit form.
+ if ($form_id == 'user_register_form' || $form_id == 'user_form') {
+ // Get all roles that are available.
+ $roles = user_role_names(TRUE);
+
+ // Get roles that are available for assignment.
+ $assignable_roles = array_intersect_key($roles, array_filter(\Drupal::config('roleassign.settings')->get('roleassign_roles')));
+
+ // Get roles already assigned to the account.
+ $account = $form_state->getFormObject()->getEntity();
+ if (!empty($account->id())) {
+ $assigned_roles = $account->getRoles();
+ // Replace numeric indexes with rolenames.
+ $assigned_roles = array_combine($assigned_roles, $assigned_roles);
+
+ // An account might already have a role that isn't available for assignment
+ // through this module. Such a role is called "sticky".
+ // Get sticky roles.
+ $sticky_roles = array_diff_key($assigned_roles, $assignable_roles);
+ $sticky_roles = array_intersect_key($roles, $sticky_roles);
+ }
+
+ // Add Authenticated user role sticky roles.
+ $sticky_roles[RoleInterface::AUTHENTICATED_ID] = $roles[RoleInterface::AUTHENTICATED_ID];
+
+ // Store sticky roles in form values.
+ $form['sticky_roles'] = array('#type' => 'value', '#value' => $sticky_roles);
+
+ // Build the assign roles checkboxes.
+ $roles_field = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Assignable roles'),
+ '#options' => $assignable_roles,
+ '#default_value' => empty($assigned_roles) ? array() : array_keys($assigned_roles),
+ '#description' => t('The user receives the combined permissions of all roles selected here and the following roles: %roles.', array('%roles' => implode(', ', $sticky_roles))),
+ );
+ // The user form is sometimes within an 'account' fieldset.
+ if (isset($form['account'])) {
+ $user_form =&$form['account'];
+ }
+ else {
+ $user_form =&$form;
+ }
+
+ // Add the assign roles checkboxes to the user form, and make sure
+ // that the notify user checkbox comes last.
+ if (isset($user_form['notify'])) {
+ $notify_field = $user_form['notify'];
+ unset($user_form['notify']);
+ $user_form['roles'] = $roles_field;
+ $user_form['notify'] = $notify_field;
+ }
+ else {
+ $user_form['roles'] = $roles_field;
+ }
+ }
+ }
+}
+
+/**
+ * Implements hook_user_presave().
+ *
+ * @param $account
+ */
+function roleassign_user_presave($account) {
+ if (roleassign_restrict_access()) {
+ $assignable_roles = array_filter(\Drupal::config('roleassign.settings')->get('roleassign_roles'));
+ $new_roles = $account->getRoles();
+
+ // Check the newly assigned roles, and whether the restricted
+ // user has privileges to do so, based on the RoleAssign settings.
+ foreach ($new_roles as $new_role) {
+ if (!in_array($new_role, $assignable_roles)) {
+ // Current user does not have privileges to change this role.
+ if(($key = array_search($new_role, $new_roles)) !== false) {
+ unset($new_roles[$key]);
+ }
+ }
+ }
+
+ if (!$account->isNew()) {
+ $original_account = $account->original;
+ $original_roles = $original_account->getRoles();
+
+ // Get a list of unassignable roles and add them to the new account roles
+ // if they were assigned originally to the account.
+ $unassignable_roles = roleassign_get_unassignable_roles();
+ foreach ($unassignable_roles as $unassignable_role) {
+ if (in_array($unassignable_role, $original_roles)) {
+ // This account will need to get this role again, since the current
+ // user is not allowed to mess with it.
+ $new_roles[] = $unassignable_role;
+ }
+ }
+ }
+
+ // $newroles now contains a list of roles (un)assigned by the
+ // restricted user + unassigneable roles that should stay unchanged.
+ $account->roles = $new_roles;
+ }
+}
+
+/**
+ * Get a list of roles that are not assignable by a restricted user
+ * that only has "assign roles" permission, not "administer permissions".
+ */
+function roleassign_get_unassignable_roles() {
+ $all_roles = user_role_names(TRUE);
+ $assignable_roles = array_filter(\Drupal::config('roleassign.settings')->get('roleassign_roles'));
+ $unassignable_roles = array_diff(array_keys($all_roles), $assignable_roles);
+ return $unassignable_roles;
+}
diff --git a/web/modules/roleassign/roleassign.permissions.yml b/web/modules/roleassign/roleassign.permissions.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2aef0e3c4906a76876c17cfe47bbaf979135c77a
--- /dev/null
+++ b/web/modules/roleassign/roleassign.permissions.yml
@@ -0,0 +1,4 @@
+assign roles:
+ title: 'Assign roles'
+ description: 'Allow users with the Administer users permission to assign a restricted set of roles.'
+ restrict access: true
diff --git a/web/modules/roleassign/roleassign.routing.yml b/web/modules/roleassign/roleassign.routing.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0dc564a14b8fd7fc341f5f95eec72c7cfa650170
--- /dev/null
+++ b/web/modules/roleassign/roleassign.routing.yml
@@ -0,0 +1,7 @@
+roleassign.settings:
+ path: '/admin/config/people/roleassign'
+ defaults:
+ _form: '\Drupal\roleassign\Form\RoleAssignAdminForm'
+ _title: 'Role assign'
+ requirements:
+ _permission: 'administer permissions'
diff --git a/web/modules/roleassign/roleassign.services.yml b/web/modules/roleassign/roleassign.services.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0a33fe0ed9ad174ea8f25130291d996040c625a9
--- /dev/null
+++ b/web/modules/roleassign/roleassign.services.yml
@@ -0,0 +1,7 @@
+services:
+ roleassign.uninstall_validator:
+ class: Drupal\roleassign\RoleAssignUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@string_translation']
+ lazy: true
diff --git a/web/modules/roleassign/roleassign.views.inc b/web/modules/roleassign/roleassign.views.inc
new file mode 100644
index 0000000000000000000000000000000000000000..a0936aeb001e25ed7fca7860d5f068808ddbbaea
--- /dev/null
+++ b/web/modules/roleassign/roleassign.views.inc
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @file
+ * Provide views data for roleassign.module.
+ */
+
+/**
+ * Implements hook_views_data_alter().
+ */
+function roleassign_views_data_alter(&$data) {
+ // Swap the default "user_bulk_form" Views field plugin with our own.
+ $data['users']['user_bulk_form']['field']['id'] = 'roleassign_user_bulk_form';
+}
diff --git a/web/modules/roleassign/src/Form/RoleAssignAdminForm.php b/web/modules/roleassign/src/Form/RoleAssignAdminForm.php
new file mode 100644
index 0000000000000000000000000000000000000000..09aafdcdc731bc3eb2bfb65261f225bd1342f84c
--- /dev/null
+++ b/web/modules/roleassign/src/Form/RoleAssignAdminForm.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\roleassign\Form\RoleAssignAdminForm.
+ */
+
+namespace Drupal\roleassign\Form;
+
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\user\RoleInterface;
+
+/**
+ * Configure book settings for this site.
+ */
+class RoleAssignAdminForm extends ConfigFormBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormId() {
+ return 'role_assign_admin';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEditableConfigNames() {
+ return ['roleassign.settings'];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildForm(array $form, FormStateInterface $form_state) {
+ // Get all available roles except for
+ // 'anonymous user' and 'authenticated user'.
+ $roles = user_role_names(TRUE);
+ unset($roles[RoleInterface::AUTHENTICATED_ID]);
+
+ // Show checkboxes with roles that can be delegated if any.
+ if ($roles) {
+ $config = $this->config('roleassign.settings');
+ $form['roleassign_roles'] = array(
+ '#type' => 'checkboxes',
+ '#title' => $this->t('Roles'),
+ '#default_value' => $config->get('roleassign_roles'),
+ '#options' => $roles,
+ '#description' => $this->t('Select roles that should be available for assignment.'),
+ );
+ }
+
+ return parent::buildForm($form, $form_state);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, FormStateInterface $form_state) {
+ $this->config('roleassign.settings')
+ ->set('roleassign_roles', $form_state->getValue('roleassign_roles'))
+ ->save();
+
+ parent::submitForm($form, $form_state);
+ }
+
+}
diff --git a/web/modules/roleassign/src/Plugin/views/field/RoleAssignUserBulkForm.php b/web/modules/roleassign/src/Plugin/views/field/RoleAssignUserBulkForm.php
new file mode 100644
index 0000000000000000000000000000000000000000..c28ae739815ebe82f0e56a23faa4f5ef82c10663
--- /dev/null
+++ b/web/modules/roleassign/src/Plugin/views/field/RoleAssignUserBulkForm.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\roleassign\Plugin\views\field\RoleAssignUserBulkForm.
+ */
+
+namespace Drupal\roleassign\Plugin\views\field;
+
+use Drupal\views\Plugin\views\display\DisplayPluginBase;
+use Drupal\views\ViewExecutable;
+use Drupal\user\Plugin\views\field\UserBulkForm;
+
+/**
+ * Defines a user operations bulk form element, with RoleAssign logic applied.
+ *
+ * @ViewsField("roleassign_user_bulk_form")
+ */
+class RoleAssignUserBulkForm extends UserBulkForm {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
+ parent::init($view, $display, $options);
+ if (roleassign_restrict_access()) {
+ // Remove actions that are not allowed based on RoleAssign settings.
+ $assignable_roles = array_filter(\Drupal::config('roleassign.settings')->get('roleassign_roles'));
+ foreach ($this->actions as $action_key => $action) {
+ if (in_array($action->get('plugin'), array('user_add_role_action', 'user_remove_role_action'))) {
+ $config = $action->get('configuration');
+ if (!in_array($config['rid'], $assignable_roles)) {
+ unset($this->actions[$action_key]);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/web/modules/roleassign/src/ProxyClass/RoleAssignUninstallValidator.php b/web/modules/roleassign/src/ProxyClass/RoleAssignUninstallValidator.php
new file mode 100644
index 0000000000000000000000000000000000000000..6c2b2d33c9287831883eca184f1a6f3a33cc85a4
--- /dev/null
+++ b/web/modules/roleassign/src/ProxyClass/RoleAssignUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\roleassign\ProxyClass\RoleAssignUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\roleassign\RoleAssignUninstallValidator' "modules/roleassign/src".
+ */
+
+namespace Drupal\roleassign\ProxyClass {
+
+ /**
+ * Provides a proxy class for \Drupal\roleassign\RoleAssignUninstallValidator.
+ *
+ * @see \Drupal\Component\ProxyBuilder
+ */
+ class RoleAssignUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+ {
+
+ use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+ /**
+ * The id of the original proxied service.
+ *
+ * @var string
+ */
+ protected $drupalProxyOriginalServiceId;
+
+ /**
+ * The real proxied service, after it was lazy loaded.
+ *
+ * @var \Drupal\roleassign\RoleAssignUninstallValidator
+ */
+ protected $service;
+
+ /**
+ * The service container.
+ *
+ * @var \Symfony\Component\DependencyInjection\ContainerInterface
+ */
+ protected $container;
+
+ /**
+ * Constructs a ProxyClass Drupal proxy object.
+ *
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+ * The container.
+ * @param string $drupal_proxy_original_service_id
+ * The service ID of the original service.
+ */
+ public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+ {
+ $this->container = $container;
+ $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+ }
+
+ /**
+ * Lazy loads the real service from the container.
+ *
+ * @return object
+ * Returns the constructed real service.
+ */
+ protected function lazyLoadItself()
+ {
+ if (!isset($this->service)) {
+ $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+ }
+
+ return $this->service;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module)
+ {
+ return $this->lazyLoadItself()->validate($module);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+ {
+ return $this->lazyLoadItself()->setStringTranslation($translation);
+ }
+
+ }
+
+}
diff --git a/web/modules/roleassign/src/RoleAssignUninstallValidator.php b/web/modules/roleassign/src/RoleAssignUninstallValidator.php
new file mode 100644
index 0000000000000000000000000000000000000000..8bcbd12c3345c774719001a7c5557d160d618954
--- /dev/null
+++ b/web/modules/roleassign/src/RoleAssignUninstallValidator.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\roleassign\RoleAssignUninstallValidator.
+ */
+
+namespace Drupal\roleassign;
+
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
+
+/**
+ * Prevents uninstallation of roleassign module by restricted users.
+ */
+class RoleAssignUninstallValidator implements ModuleUninstallValidatorInterface {
+
+ use StringTranslationTrait;
+
+ /**
+ * Constructs a new RoleAssignUninstallValidator.
+ *
+ * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+ * The string translation service.
+ */
+ public function __construct(TranslationInterface $string_translation) {
+ $this->stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+ if ($module == "roleassign") {
+ if (!\Drupal::currentUser()->hasPermission('administer roles')) {
+ $reasons[] = $this->t('You are not allowed to disable this module.');
+ }
+ }
+ return $reasons;
+ }
+
+}
diff --git a/web/modules/roleassign/src/Tests/RoleAssignPermissionTest.php b/web/modules/roleassign/src/Tests/RoleAssignPermissionTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d78124d885b64f4871ec96606b7461ad4687df6f
--- /dev/null
+++ b/web/modules/roleassign/src/Tests/RoleAssignPermissionTest.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\roleassign\Tests\RoleAssignPermissionTest.
+ */
+
+namespace Drupal\roleassign\Tests;
+
+use Drupal\simpletest\WebTestBase;
+use Drupal\user\Entity\User;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests that users can (un)assign roles based on the RoleAssign settings.
+ *
+ * @group roleassign
+ */
+class RoleAssignPermissionTest extends WebTestBase {
+
+ /**
+ * The user object to test (un)assigning roles to.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $testaccount;
+
+ /**
+ * The user object that has restricted access to assign roles but not
+ * administer permissions.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $restricted_user;
+
+ /**
+ * The user object that has access to administer users & permissions.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $admin_user;
+
+ /**
+ * Modules to install.
+ *
+ * @var array
+ */
+ public static $modules = ['roleassign'];
+
+ protected function setUp() {
+ parent::setUp();
+
+ // Add Editor role
+ $this->drupalCreateRole(array(), 'editor', 'Editor');
+ // Add Webmaster role
+ $this->drupalCreateRole(array('administer users', 'assign roles'), 'webmaster', 'Webmaster');
+ // Add 'protected' SiteAdmin role
+ $this->drupalCreateRole(array('administer users', 'administer permissions'), 'siteadmin', 'SiteAdmin');
+
+ // Configure RoleAssign module - only editor & webmaster roles are
+ // assignable by restricted users (i.e. webmasters)
+ $this->config('roleassign.settings')
+ ->set('roleassign_roles', array('editor' => 'editor', 'webmaster' => 'webmaster'))
+ ->save();
+
+ // Create a testaccount that we will be trying to assign roles.
+ $this->testaccount = $this->drupalCreateUser();
+
+ // Create a test restricted user without "administer permissions" permission
+ // but with "assign roles" permission provided by RoleAssign.
+ $this->restricted_user = $this->drupalCreateUser(array('administer users', 'assign roles'));
+
+ // Create a test admin user with "administer users " &
+ // "administer permissions" permissions, where RoleAssign will have no
+ // effect on.
+ $this->admin_user = $this->drupalCreateUser(array('administer users', 'administer permissions'));
+ }
+
+ /**
+ * Tests that RoleAssign settings are set up correctly.
+ */
+ function testRoleAssignSettings() {
+ $assignable_roles = array_filter(\Drupal::config('roleassign.settings')->get('roleassign_roles'));
+ $this->assertIdentical(array('editor' => 'editor', 'webmaster' => 'webmaster'), $assignable_roles);
+ }
+
+ /**
+ * Tests that a restricted user can only (un)assign configured roles.
+ */
+ function testRoleAssignRestrictedUser() {
+ // Login as restricted user to test RoleAssign
+ $this->drupalLogin($this->restricted_user);
+
+ // Load account edit page
+ $this->drupalGet('user/' . $this->testaccount->id() . '/edit');
+
+ // Check that only assignable roles are displayed
+ $this->assertText(t('Assignable roles'));
+ $this->assertNoFieldChecked('edit-roles-editor');
+ $this->assertNoFieldChecked('edit-roles-webmaster');
+ $this->assertNoField('edit-roles-siteadmin');
+
+ // Assign the role "editor" to the account.
+ $this->drupalPostForm('user/' . $this->testaccount->id() . '/edit', array("roles[editor]" => "editor"), t('Save'));
+ $this->assertText(t('The changes have been saved.'));
+ $this->assertFieldChecked('edit-roles-editor', 'Role editor is assigned.');
+ $this->assertNoFieldChecked('edit-roles-webmaster');
+ $this->assertNoField('edit-roles-siteadmin');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, 'editor');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, RoleInterface::AUTHENTICATED_ID);
+
+ // Remove the role "editor" from the account.
+ $this->drupalPostForm('user/' . $this->testaccount->id() . '/edit', array("roles[editor]" => FALSE), t('Save'));
+ $this->assertText(t('The changes have been saved.'));
+ $this->assertNoFieldChecked('edit-roles-editor', 'Role editor is removed.');
+ $this->assertNoFieldChecked('edit-roles-webmaster');
+ $this->assertNoField('edit-roles-siteadmin');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, 'editor', FALSE);
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, RoleInterface::AUTHENTICATED_ID);
+
+ // Try to assign a restricted role programmatically to a new user.
+ $values = array(
+ 'name' => $this->randomString(),
+ 'roles' => array('editor', 'siteadmin'),
+ );
+ $code_account = User::create($values);
+ $code_account->save();
+
+ // Check that user only gets editor role, but not siteadmin role.
+ $this->assertTrue($code_account->hasRole('editor'));
+ $this->assertFalse($code_account->hasRole('siteadmin'));
+ }
+
+ /**
+ * Tests that an admin user with "administer permissions" can add all roles.
+ */
+ function testRoleAssignAdminUser() {
+ // Login as admin user
+ $this->drupalLogin($this->admin_user);
+
+ // Load account edit page
+ $this->drupalGet('user/' . $this->testaccount->id() . '/edit');
+
+ // Check that Drupal default roles checkboxes are shown.
+ $this->assertText(t('Roles'));
+ $this->assertNoFieldChecked('edit-roles-editor');
+ $this->assertNoFieldChecked('edit-roles-webmaster');
+ $this->assertNoFieldChecked('edit-roles-siteadmin');
+
+ // Assign the role "SiteAdmin" to the account.
+ $this->drupalPostForm('user/' . $this->testaccount->id() . '/edit', array("roles[siteadmin]" => "siteadmin"), t('Save'));
+ $this->assertText(t('The changes have been saved.'));
+ $this->assertFieldChecked('edit-roles-siteadmin', 'Role siteadmin is assigned.');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, 'siteadmin');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, RoleInterface::AUTHENTICATED_ID);
+
+ // Now log in as restricted user again
+ $this->drupalLogin($this->restricted_user);
+
+ // Assign the role "editor" to the account, and test that the assigned
+ // "siteadmin" role doesn't get lost.
+ $this->drupalPostForm('user/' . $this->testaccount->id() . '/edit', array("roles[editor]" => "editor"), t('Save'));
+ $this->assertText(t('The changes have been saved.'));
+ $this->assertFieldChecked('edit-roles-editor', 'Role editor is assigned.');
+ $this->assertNoField('edit-roles-siteadmin');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, 'editor');
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, RoleInterface::AUTHENTICATED_ID);
+ $this->userLoadAndCheckRoleAssigned($this->testaccount, 'siteadmin');
+ }
+
+ /**
+ * Check role on user object.
+ *
+ * @param object $account
+ * The user account to check.
+ * @param string $rid
+ * The role ID to search for.
+ * @param bool $is_assigned
+ * (optional) Whether to assert that $rid exists (TRUE) or not (FALSE).
+ * Defaults to TRUE.
+ */
+ private function userLoadAndCheckRoleAssigned($account, $rid, $is_assigned = TRUE) {
+ $user_storage = $this->container->get('entity.manager')->getStorage('user');
+ $user_storage->resetCache(array($account->id()));
+ $account = $user_storage->load($account->id());
+ if ($is_assigned) {
+ $this->assertFalse(array_search($rid, $account->getRoles()) === FALSE, 'The role is present in the user object.');
+ }
+ else {
+ $this->assertTrue(array_search($rid, $account->getRoles()) === FALSE, 'The role is not present in the user object.');
+ }
+ }
+
+}