stash URLs for return and check all values for profiles

darcs-hash:20080606065027-84dde-a4ac215010b76ef296976fdf8a94473bd80c7ffa.gz

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 1ec842f2647e01c5f462dcf5c471b3219890940a..eb105c1e734491362ba4c86db57ae5cd29010086 100644 (file)
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -140,21 +140,34 @@ class FinishremotesubscribeAction extends Action {
                } else {
                        $profile->created = DB_DataObject_Cast::dateTime(); # current time
                        $id = $profile->insert();
+                       if (!$id) {
+                               common_server_error(_t('Error inserting new profile'));
+                               return;
+                       }
                        $remote->id = $id;
                }
 
                if ($avatar_url) {
-                       $this->add_avatar($profile, $avatar_url);
+                       if (!$this->add_avatar($profile, $avatar_url)) {
+                               common_server_error(_t('Error inserting avatar'));
+                               return;
+                       }
                }
 
-               $remote->postnoticeurl = $omb[OMB_ENDPOINT_POSTNOTICE];
-               $remote->updateprofileurl = $omb[OMB_ENDPOINT_UPDATEPROFILE];
+               $remote->postnoticeurl = $omb['post_notice_url'];
+               $remote->updateprofileurl = $omb['update_profile_url'];
 
                if ($exists) {
-                       $remote->update($orig_remote);
+                       if (!$remote->update($orig_remote)) {
+                               common_server_error(_t('Error updating remote profile'));
+                               return;
+                       }
                } else {
                        $remote->created = DB_DataObject_Cast::dateTime(); # current time
-                       $remote->insert;
+                       if (!$remote->insert()) {
+                               common_server_error(_t('Error inserting remote profile'));
+                               return;
+                       }
                }
                
                $sub = new Subscription();

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 8baa3b7af54ab602ee7cfc334277855ab108ef21..214bd863a60ff75d935fe0d7563fea5584fb0c80 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -313,6 +313,8 @@ class RemotesubscribeAction extends Action {
                $omb['secret'] = $secret;
                # call doesn't work after bounce back so we cache; maybe serialization issue...?
                $omb['access_token_url'] = omb_service_uri($omb[OAUTH_ENDPOINT_ACCESS]);
+               $omb['post_notice_url'] = omb_service_uri($omb[OMB_ENDPOINT_POSTNOTICE]);
+               $omb['update_profile_url'] = omb_service_uri($omb[OMB_ENDPOINT_UPDATEPROFILE]);
 
                $_SESSION['oauth_authorization_request'] = $omb;
 

diff --git a/doc/TODO b/doc/TODO
index fd2c25767075afbcd4f7461270020eabc71565a5..3f8321507de98a686ab0923e28ac45af9e2d9755 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -55,11 +55,11 @@
 + release 0.2
 + YADIS document link on showstream
 + YADIS document
-- subscribe remote
-- add subscriber remote
-- server side of user authorization
++ subscribe remote
++ add subscriber remote
++ server side of user authorization
 + server side of request token
-- server side of access token
++ server side of access token
 + OAuth store
 + log of consumers who ask for access
 - receive remote notice