oauth_google_login: inline getGoogleClientIdAndSecretKey

no need to expose this

bt5/erp5_oauth_google_login/ExtensionTemplateItem/portal_components/extension.erp5.GoogleLoginUtility.py

@@ -5,8 +5,27 @@ from Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin import getGoogleUs
 SCOPE_LIST = ['https://www.googleapis.com/auth/userinfo.profile',
               'https://www.googleapis.com/auth/userinfo.email']
 
+
+def _getGoogleClientIdAndSecretKey(portal, reference="default"):
+  """Returns google client id and secret key.
+
+  Internal function.
+  """
+  result_list = portal.portal_catalog.unrestrictedSearchResults(
+    portal_type="Google Connector",
+    reference=reference,
+    validation_state="validated",
+    limit=2,
+  )
+  assert result_list, "Google Connector not found"
+  if len(result_list) == 2:
+    raise ValueError("Impossible to select one Google Connector")
+
+  google_connector = result_list[0].getObject()
+  return google_connector.getClientId(), google_connector.getSecretKey()
+
 def redirectToGoogleLoginPage(self):
-  client_id, secret_key = self.ERP5Site_getGoogleClientIdAndSecretKey()
+  client_id, secret_key = _getGoogleClientIdAndSecretKey(self.getPortalObject())
   flow = oauth2client.client.OAuth2WebServerFlow(
     client_id=client_id,
     client_secret=secret_key,
@@ -18,8 +37,7 @@ def redirectToGoogleLoginPage(self):
   self.REQUEST.RESPONSE.redirect(flow.step1_get_authorize_url())
 
 def getAccessTokenFromCode(self, code, redirect_uri):
-  portal = self.getPortalObject()
-  client_id, secret_key = portal.ERP5Site_getGoogleClientIdAndSecretKey()
+  client_id, secret_key = _getGoogleClientIdAndSecretKey(self.getPortalObject())
   flow = oauth2client.client.OAuth2WebServerFlow(
     client_id=client_id,
     client_secret=secret_key,

bt5/erp5_oauth_google_login/SkinTemplateItem/portal_skins/erp5_oauth_google_login/ERP5Site_getGoogleClientIdAndSecretKey.py

-if REQUEST is not None:
-  raise ValueError("This script can't be called in the URL")
-
-result_list = context.getPortalObject().portal_catalog(
-  portal_type="Google Connector",
-  reference=reference,
-  validation_state="validated",
-  limit=2,
-)
-
-assert result_list, "Google Connector not found"
-
-if len(result_list) == 2:
-  raise ValueError("Impossible to select one Google Connector")
-
-google_connector = result_list[0].getObject()
-return google_connector.getClientId(), google_connector.getSecretKey()

bt5/erp5_oauth_google_login/SkinTemplateItem/portal_skins/erp5_oauth_google_login/ERP5Site_getGoogleClientIdAndSecretKey.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>reference="default", REQUEST=None</string> </value>
-        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>ERP5Site_getGoogleClientIdAndSecretKey</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>