Merge 4b056a9 into 7b28e72

inveniosoftware · Jul 28, 2016 · 3e92878 · 3e92878
2 parents 7b28e72 + 4b056a9
commit 3e92878
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -24,7 +24,7 @@
 Changes
 =======
 
-Version 1.0.0a7 (released 2016-07-07)
+Version 1.0.0a8 (released 2016-07-27)
 -------------------------------------
 
 - Refactoring for Invenio 3.

diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst
@@ -1,8 +1,8 @@
 ==============================
- Invenio-OAuthClient v1.0.0a7
+ Invenio-OAuthClient v1.0.0a8
 ==============================
 
-Invenio-OAuthClient v1.0.0a7 was released on July 7, 2016.
+Invenio-OAuthClient v1.0.0a8 was released on July 27, 2016.
 
 About
 -----
@@ -19,7 +19,7 @@ What's new
 Installation
 ------------
 
-   $ pip install invenio-oauthclient==1.0.0a7
+   $ pip install invenio-oauthclient==1.0.0a8
 
 Documentation
 -------------

diff --git a/invenio_oauthclient/handlers.py b/invenio_oauthclient/handlers.py
@@ -35,7 +35,8 @@
     OAuthRejectedRequestError, OAuthResponseError
 from .models import RemoteAccount, RemoteToken
 from .proxies import current_oauthclient
-from .signals import account_info_received, account_setup_received
+from .signals import account_info_received, account_setup_committed, \
+    account_setup_received
 from .utils import disable_csrf, fill_form, oauth_authenticate, \
     oauth_get_user, oauth_register, registrationform_cls
 
@@ -245,7 +246,7 @@ def authorized_signup_handler(resp, remote, *args, **kwargs):
             )
             user = oauth_register(form)
 
-            # if registration fails..
+            # if registration fails ...
             if user is None:
                 # requires extra information
                 session[
@@ -281,10 +282,13 @@ def authorized_signup_handler(resp, remote, *args, **kwargs):
         account_setup_received.send(
             remote, token=token, response=resp, account_setup=account_setup
         )
+        db.session.commit()
+        account_setup_committed.send(remote, token=token)
+    else:
+        db.session.commit()
 
     # Redirect to next
     next_url = get_session_next_url(remote.name)
-    db.session.commit()
     if next_url:
         return redirect(next_url)
     return redirect(url_for('invenio_oauthclient_settings.index'))
@@ -358,9 +362,12 @@ def signup_handler(remote, *args, **kwargs):
                 remote, token=token, response=response,
                 account_setup=account_setup
             )
-
-        # Registration has been finished
-        db.session.commit()
+            # Registration has been finished
+            db.session.commit()
+            account_setup_committed.send(remote, token=token)
+        else:
+            # Registration has been finished
+            db.session.commit()
 
         # Authenticate the user
         if not oauth_authenticate(remote.consumer_key, user,

diff --git a/invenio_oauthclient/signals.py b/invenio_oauthclient/signals.py
@@ -63,3 +63,22 @@ def load_extra_information(remote, token=None, response=None,
         # process response
 
 """
+
+
+account_setup_committed = _signals.signal(
+    'oauthclient-account-setup-committed')
+"""Signal is sent after account setup has been committed to database.
+
+Example subscriber:
+
+.. code-block:: python
+
+    from invenio_oauthclient.signals import account_setup_committed
+
+    # During overlay initialization.
+    @account_setup_committed.connect
+    def fetch_info(remote):
+        response = remote.get('https://example.org/api/resource')
+        # process response
+
+"""
diff --git a/invenio_oauthclient/version.py b/invenio_oauthclient/version.py
@@ -28,4 +28,4 @@
 and parsed by ``setup.py``.
 """
 
-__version__ = '1.0.0a8.dev20160708'
+__version__ = '1.0.0a8'