global: undo style changes

invenio_oauthclient/config.py

@@ -105,22 +105,22 @@
     {
         "email": "[email protected]",
         "password": "somepassword",
-        "username": "test-user",
         "profile": {
+            "username": "test-user",
             "full_name": "Test User",
         }
     }
 
     # precedence_mask
     {
         "email": True,
-        "username": True,
         "profile": {
+            "username": True,
             "full_name": False,
         }
     }
 
-Then, the values for `email` and `username` from the
+Then, the values for `email` and `profile.username` from the
 `user_info` would be overriding any user input from the registration
 form.
 All other values would be used as provided by the user in the form.

invenio_oauthclient/contrib/cern.py

@@ -409,10 +409,11 @@ def _account_info(remote, resp):
     external_id = resource.get('uidNumber', person_id)[0]
     nice = resource['CommonName'][0]
     name = resource['DisplayName'][0]
+
     return dict(
         user=dict(
             email=email.lower(),
-            profile=dict(full_name=name, username=nice),
+            profile=dict(username=nice, full_name=name),
         ),
         external_id=external_id, external_method='cern',
         active=True

invenio_oauthclient/contrib/cern_openid.py

@@ -282,18 +282,13 @@ def _account_info(remote, resp):
         )
 
     email = resource["email"]
-    person_id = resource.get("cern_person_id")
     external_id = resource["cern_upn"]
     nice = resource["preferred_username"]
     name = resource["name"]
 
     return dict(
         user=dict(
-            email=email.lower(),
-            profile=dict(
-                username=nice,
-                full_name=name,
-            )
+            email=email.lower(), profile=dict(username=nice, full_name=name)
         ),
         external_id=external_id,
         external_method="cern_openid",
@@ -367,7 +362,6 @@ def account_setup(remote, token, resp):
     resource = get_resource(remote, resp)
 
     with db.session.begin_nested():
-        person_id = resource.get("cern_person_id")
         external_id = resource.get("cern_upn")
 
         # Set CERN person ID in extra_data.

invenio_oauthclient/contrib/github.py

@@ -167,8 +167,8 @@ def account_info(remote, resp):
         {
             'user': {
                 'email': '...',
-                'username': '...',
                 'profile': {
+                    'username': '...',
                     'full_name': '...',
                 }
             },
@@ -190,8 +190,8 @@ def account_info(remote, resp):
         user=dict(
             email=_extract_email(gh),
             profile=dict(
-                full_name=me.name,
                 username=me.login,
+                full_name=me.name,
             ),
         ),
         external_id=str(me.id),

invenio_oauthclient/contrib/globus.py

@@ -206,8 +206,8 @@ def account_info(remote, resp):
         {
             'user': {
                 'email': '...',
-                'username': '...',
                 'profile': {
+                    'username': '...',
                     'full_name': '...',
                 }
             },

invenio_oauthclient/contrib/keycloak/handlers.py

@@ -60,8 +60,8 @@ def info_handler(remote, resp):
             "active": True,
             "email": user_info["email"],
             "profile": {
-                "username": user_info.get("preferred_username"),
                 "full_name": user_info.get("name"),
+                "username": user_info.get("preferred_username"),
                 "affiliation": '',
             }
         },

invenio_oauthclient/utils.py

@@ -259,12 +259,10 @@ def load_or_import_from_config(key, app=None, default=None):
 
 def _create_registrationform(*args, **kwargs):
     """Default registration form after external auth success."""
-
     class RegistrationForm(_security.confirm_register_form):
         password = None
         recaptcha = None
         submit = None  # defined in the template
-
     return RegistrationForm(*args, **kwargs)
 
 

tests/test_contrib_cern.py

@@ -94,7 +94,7 @@ def test_account_info(app, example_cern):
             user=dict(
                 email='[email protected]',
                 profile={
-                    'full_name': u'Test Account', 'username': 'taccount',
+                    'full_name': u'Test Account', 'username': u'taccount'
                 },
             ),
             external_id='123456', external_method='cern',

tests/test_contrib_cern_openid.py

@@ -46,7 +46,7 @@ def example_cern_openid(request):
     ), dict(
         user=dict(
             email='[email protected]',
-            profile=dict(full_name='John Doe', username='jdoe'),
+            profile=dict(username='jdoe', full_name='John Doe'),
         ),
         external_id='222222', external_method='cern_openid',
         active=True

tests/test_contrib_cern_openid_rest.py

@@ -50,7 +50,7 @@ def example_cern_openid_rest(request):
     ), dict(
         user=dict(
             email='[email protected]',
-            profile=dict(full_name='John Doe', username='jdoe'),
+            profile=dict(username='jdoe', full_name='John Doe'),
         ),
         external_id='222222', external_method='cern_openid',
         active=True

tests/test_contrib_github.py

@@ -186,8 +186,8 @@ def test_authorized_signup_username_already_exists(app, example_github, user):
                 data={
                     'email': example_email,
                     'password': '123456',
-                    'profile.full_name': 'pluto',
                     'profile.username': 'pippo2',
+                    'profile.full_name': 'pluto',
                     'profile.affiliations': 'CERN'
                 }
             )

tests/test_contrib_github_rest.py

@@ -199,8 +199,8 @@ def test_authorized_signup_username_already_exists(
                 data={
                     'email': example_email,
                     'password': '123456',
-                    'profile.full_name': 'pluto',
                     'profile.username': 'pippo2',
+                    'profile.full_name': 'pluto',
                     'profile.affiliations': 'CERN'
                 }
             )

tests/test_contrib_orcid.py

@@ -91,12 +91,11 @@ def test_authorized_signup(app_with_userprofiles, example_orcid, orcid_bio):
         assert resp.status_code == 200
 
         account_info = session[token_session_key('orcid') + '_account_info']
-        full_name = account_info['user']['profile']['full_name']
         data = {
             'email': example_email,
             'password': '123456',
             'profile.username': 'pippo',
-            'profile.full_name': full_name,
+            'profile.full_name': account_info['user']['profile']['full_name'],
             'profile.affiliations': 'CERN',
         }
 

tests/test_contrib_orcid_rest.py

@@ -93,12 +93,11 @@ def test_authorized_signup(app_rest_with_userprofiles,
         assert resp.status_code == 302
 
         account_info = session[token_session_key('orcid') + '_account_info']
-        full_name = account_info['user']['profile']['full_name']
         data = {
             'email': example_email,
             'password': '123456',
-            'profile.full_name': full_name,
             'profile.username': 'pippo',
+            'profile.full_name': account_info['user']['profile']['full_name'],
             'profile.affiliations': 'CERN'
         }