girder-oauth 3.2.13.dev11__tar.gz → 3.2.15.dev2__tar.gz

{girder_oauth-3.2.13.dev11 → girder_oauth-3.2.15.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-oauth
-Version: 3.2.13.dev11
+Version: 3.2.15.dev2
 Summary: Allow users to login via supported OAuth2 providers.
 Home-page: http://girder.readthedocs.io/en/latest/plugins.html#oauth-login
 Author: Kitware, Inc.

{girder_oauth-3.2.13.dev11 → girder_oauth-3.2.15.dev2}/girder_oauth/providers/base.py

@@ -139,8 +139,10 @@ class ProviderBase:
         setId = not user
 
         # Existing users using OAuth2 for the first time will not have an ID
+        # We check the lower-case email, as Girder users cast emails to
+        # lower-case
         if not user:
-            user = User().findOne({'email': email})
+            user = User().findOne({'email': email.lower()})
 
         dirty = False
         # Create the user if it's still not found
@@ -162,8 +164,8 @@ class ProviderBase:
                 user['oauth'] = [user['oauth']]
                 dirty = True
             # Update user data from provider
-            if email != user['email']:
-                user['email'] = email
+            if email.lower() != user['email']:
+                user['email'] = email.lower()
                 dirty = True
             # Don't set names to empty string
             if firstName != user['firstName'] and firstName:

{girder_oauth-3.2.13.dev11 → girder_oauth-3.2.15.dev2}/girder_oauth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-oauth
-Version: 3.2.13.dev11
+Version: 3.2.15.dev2
 Summary: Allow users to login via supported OAuth2 providers.
 Home-page: http://girder.readthedocs.io/en/latest/plugins.html#oauth-login
 Author: Kitware, Inc.

{girder_oauth-3.2.13.dev11 → girder_oauth-3.2.15.dev2}/setup.py

@@ -1,4 +1,5 @@
 import os
+import re
 
 from setuptools import find_packages, setup
 
@@ -12,7 +13,11 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') == 'master':
+    # this regex allows us to publish pypi packages from master, our LTS maintenance branches, and
+    # our next major version integration branches
+    pattern = r'master|[0-9]+\.x-maintenance|v[0-9]+-integration'
+
+    if re.match(pattern, os.getenv('CIRCLE_BRANCH', '')):
         return ''
     else:
         return get_local_node_and_date(version)