Skip to content

erp5
erp5
Commit 05deeb26 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

oauth_facebook_login: inline getFacebookClientIdAndSecretKey 

no need to expose this, also move ERP5Site_redirectToFacebookLoginPage
as an external method, to be able to access the shared utility function
parent 03072ffc
Pipeline #5634 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 40 additions and 155 deletions
    bt5/erp5_oauth_facebook_login/ExtensionTemplateItem/portal_components/extension.erp5.FacebookLoginUtility.py
    View file @ 05deeb26
    import facebook import facebook
    from ZTUtils import make_query
    from Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin import getFacebookUserEntry from Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin import getFacebookUserEntry
    def _getFacebookClientIdAndSecretKey(portal, reference="default"):
    """Returns facebook client id and secret key.
    Internal function.
    """
    result_list = portal.portal_catalog.unrestrictedSearchResults(
    portal_type="Facebook Connector",
    reference=reference,
    validation_state="validated",
    limit=2,
    )
    assert result_list, "Facebook Connector not found"
    if len(result_list) == 2:
    raise ValueError("Impossible to select one Facebook Connector")
    facebook_connector = result_list[0]
    return facebook_connector.getClientId(), facebook_connector.getSecretKey()
    def redirectToFacebookLoginPage(self, came_from=None):
    client_id, _ = _getFacebookClientIdAndSecretKey(self.getPortalObject())
    query = make_query({
    # Call at he context of the appropriate web_service.
    'client_id': client_id,
    'redirect_uri': "{0}/ERP5Site_callbackFacebookLogin".format(came_from or self.absolute_url()),
    'scope': 'email'
    })
    return self.REQUEST.RESPONSE.redirect("https://www.facebook.com/v2.10/dialog/oauth?{}".format(query))
    def getAccessTokenFromCode(self, code, redirect_uri): def getAccessTokenFromCode(self, code, redirect_uri):
    client_id, secret_key = self.ERP5Site_getFacebookClientIdAndSecretKey() client_id, secret_key = _getFacebookClientIdAndSecretKey(self.getPortalObject())
    return facebook.GraphAPI(version="2.7").get_access_token_from_code( return facebook.GraphAPI(version="2.7").get_access_token_from_code(
    code=code, redirect_uri=redirect_uri, code=code, redirect_uri=redirect_uri,
    app_id=client_id, app_secret=secret_key) app_id=client_id, app_secret=secret_key)
    ......
    bt5/erp5_oauth_facebook_login/SkinTemplateItem/portal_skins/erp5_oauth_facebook_login/ERP5Site_getFacebookClientIdAndSecretKey.py deleted 100644 → 0
    View file @ 03072ffc
    if REQUEST is not None:
    raise ValueError("This script can't be called in the URL")
    result_list = context.getPortalObject().portal_catalog(
    portal_type="Facebook Connector",
    reference=reference,
    validation_state="validated",
    limit=2,
    )
    assert result_list, "Facebook Connector not found"
    if len(result_list) == 2:
    raise ValueError("Impossible to select one Facebook Connector")
    facebook_connector = result_list[0]
    return facebook_connector.getClientId(), facebook_connector.getSecretKey()
    bt5/erp5_oauth_facebook_login/SkinTemplateItem/portal_skins/erp5_oauth_facebook_login/ERP5Site_getFacebookClientIdAndSecretKey.xml deleted 100644 → 0
    View file @ 03072ffc
    <?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_getFacebookClientIdAndSecretKey</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_oauth_facebook_login/SkinTemplateItem/portal_skins/erp5_oauth_facebook_login/ERP5Site_redirectToFacebookLoginPage.py deleted 100644 → 0
    View file @ 03072ffc
    from ZTUtils import make_query
    client_id, _ = context.ERP5Site_getFacebookClientIdAndSecretKey()
    query = make_query({
    # Call at he context of the appropriate web_service.
    'client_id': client_id,
    'redirect_uri': "{0}/ERP5Site_callbackFacebookLogin".format(came_from or context.absolute_url()),
    'scope': 'email'
    })
    login_url = "https://www.facebook.com/v2.10/dialog/oauth"
    if "?" not in login_url:
    login_url += "?"
    return context.REQUEST.RESPONSE.redirect("{0}{1}".format(login_url, query))
    bt5/erp5_oauth_facebook_login/SkinTemplateItem/portal_skins/erp5_oauth_facebook_login/ERP5Site_redirectToFacebookLoginPage.xml
    View file @ 05deeb26
    ...@@ -2,68 +2,26 @@ ...@@ -2,68 +2,26 @@
    <ZopeData> <ZopeData>
    <record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
    <pickle> <pickle>
    <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <dictionary> <dictionary>
    <item> <item>
    <key> <string>Script_magic</string> </key> <key> <string>_function</string> </key>
    <value> <int>3</int> </value> <value> <string>redirectToFacebookLoginPage</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>_bind_names</string> </key> <key> <string>_module</string> </key>
    <value> <value> <string>FacebookLoginUtility</string> </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>came_from=None</string> </value>
    </item>
    <item>
    <key> <string>_proxy_roles</string> </key>
    <value>
    <tuple>
    <string>Auditor</string>
    </tuple>
    </value>
    </item> </item>
    <item> <item>
    <key> <string>id</string> </key> <key> <string>id</string> </key>
    <value> <string>ERP5Site_redirectToFacebookLoginPage</string> </value> <value> <string>ERP5Site_redirectToFacebookLoginPage</string> </value>
    </item> </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary> </dictionary>
    </pickle> </pickle>
    </record> </record>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7