erp5_oauth_google_login: s/erp5_username/user_id/g to be with consistent with...

erp5_oauth_google_login: s/erp5_username/user_id/g to be with consistent with Base_getUserValueByUserId

bt5/erp5_oauth_google_login/SkinTemplateItem/portal_skins/erp5_oauth_google_login/Base_createOauth2User.py

@@ -20,7 +20,7 @@ activate_kw = {'tag': tag}
 # to support Facebook login
 assert login_portal_type in ("Google Login",), "Impossible to select a portal type"
 
-if erp5_username in ("Anonymous User", None):
+if user_id in ("Anonymous User", None):
   person = portal.person_module.newContent(portal_type='Person',
                                            user_id=reference,
                                            first_name=first_name,
@@ -50,7 +50,7 @@ if erp5_username in ("Anonymous User", None):
   assignment.open(activate_kw=activate_kw)
   person.setDefaultCareerRoleList(assignment.getRoleList())
 else:
-  person = context.Base_getUserValueByUserId(erp5_username)
+  person = context.Base_getUserValueByUserId(user_id)
 
 login = person.newContent(portal_type=login_portal_type,
                           reference=reference)

bt5/erp5_oauth_google_login/SkinTemplateItem/portal_skins/erp5_oauth_google_login/Base_createOauth2User.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>tag, first_name, last_name, reference, email, login_portal_type, erp5_username=None</string> </value>
+            <value> <string>tag, first_name, last_name, reference, email, login_portal_type, user_id=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_oauth_google_login/SkinTemplateItem/portal_skins/erp5_oauth_google_login/ERP5Site_receiveGoogleCallback.py

@@ -20,7 +20,7 @@ elif code is not None:
   if response_dict is not None:
     access_token = response_dict['access_token'].encode('utf-8')
     response_dict['login'] = context.ERP5Site_getGoogleUserId(access_token)
-    response_dict['erp5_username'] = portal.portal_membership.getAuthenticatedMember().getUserName()
+    response_dict['user_id'] = portal.portal_membership.getAuthenticatedMember().getUserName()
     hash_str = context.Base_getHMAC(access_token, access_token)
     context.REQUEST.RESPONSE.setCookie('__ac_google_hash', hash_str, path='/')
     context.Base_setBearerToken(hash_str,

bt5/erp5_oauth_google_login/TestTemplateItem/portal_components/test.erp5.testGoogleLogin.py

@@ -142,7 +142,7 @@ class TestGoogleLogin(ERP5TypeTestCase):
                   "reference": user_id,
                   "email": 'example@email.com',
                   "login_portal_type": "Google Login",
-                  "erp5_username": self.dummy_user_id
+                  "user_id": self.dummy_user_id
                  }
     # We are using superuser to avoid Unauthorized error
     # The goal of this test to check if Google Login is created
@@ -164,7 +164,7 @@ class TestGoogleLogin(ERP5TypeTestCase):
                   "reference": user_id,
                   "email": 'example@email.com',
                   "login_portal_type": "Google Login",
-                  "erp5_username": 'Anonymous User'
+                  "user_id": 'Anonymous User'
                  }
     self.portal.Base_createOauth2User(**user_entry)
     self.tic()

product/ERP5Security/ERP5ExternalOauth2ExtractionPlugin.py

@@ -189,9 +189,9 @@ class ERP5ExternalOauth2ExtractionPlugin:
         try:
           self.REQUEST['USER_CREATION_IN_PROGRESS'] = user_dict
           user_entry["login_portal_type"] = creds["login_portal_type"]
-          # erp5_username is optional.
+          # user_id is optional.
           # It is only used to create Google Login under a pre-existing person
-          user_entry["erp5_username"] = user_dict.get("erp5_username")
+          user_entry["user_id"] = user_dict.get("user_id")
           try:
             Base_createOauth2User(tag, **user_entry)
           except Exception: