Skip to content

Commit

Permalink
Merge pull request #25 from Monogramm/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
madmath03 authored Mar 16, 2019
2 parents 00b2902 + 5aec013 commit 0add6b8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
version = ":versiontools:taiga_contrib_ldap_auth_ext:",
description = "The (extended) Taiga plugin for ldap authentication",
long_description = "Extended Taiga.io plugin for LDAP authentication. This is a fork of ensky/taiga-contrib-ldap-auth which also retrieves the various contributions and other forks into one.",
download_url = 'https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/archive/v0.4.1.tar.gz',
download_url = 'https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/archive/v0.4.2.tar.gz',
keywords = 'taiga, ldap, auth, plugin',
author = 'madmath03',
author_email = '[email protected]',
Expand Down
2 changes: 1 addition & 1 deletion taiga_contrib_ldap_auth_ext/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

__version__ = (0, 4, 1)
__version__ = (0, 4, 2)

default_app_config = "taiga_contrib_ldap_auth_ext.apps.TaigaContribLDAPAuthAppConfig"
5 changes: 2 additions & 3 deletions taiga_contrib_ldap_auth_ext/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def register_or_update(username: str, email: str, full_name: str, password: str)

# TODO https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/issues/15
# TODO https://github.com/Monogramm/taiga-contrib-ldap-auth-ext/issues/17
superuser = false
superuser = False

try:
# has user logged in before?
Expand All @@ -110,8 +110,7 @@ def register_or_update(username: str, email: str, full_name: str, password: str)
# create a new user
user = user_model.objects.create(username = username_unique,
email = email,
full_name = full_name,
is_staff = superuser,
full_name = full_name,
is_superuser = superuser)
# Set local password to match LDAP (issues/21)
user.set_password(password)
Expand Down

0 comments on commit 0add6b8

Please sign in to comment.