Sync changes from upstream repository

Hubot · Hubot · commit 0d6f4de35451 · 2014-09-12T16:30:21.000Z
diff --git a/content/changes/2014-09-12-changing-organization-feeds.md b/content/changes/2014-09-12-changing-organization-feeds.md
@@ -0,0 +1,46 @@
+---
+kind: change
+title: Changing organization feeds in the Feeds API
+created_at: 2014-09-12
+author_name: mastahyeti
+---
+
+We have deprecated the `current_user_organization_url` attribute and the
+`current_user_organization.href` attribute in the [Feeds API][docs]. If you make
+use of these attributes, you'll want to update your code to use the new
+`current_user_organization_urls` attribute instead.
+
+### Changes to the deprecated attributes
+
+Previously, the deprecated attributes returned URI template. For example:
+
+<pre><code class="language-javascript">
+"current_user_organization_url":
+  "https://github.com/organizations/{org}/mastahyeti.private.atom?token=abc123"
+</code></pre>
+
+The template included a deprecated authentication token. Our new tokens are
+valid only for a concrete feed URL (not for a URI template). Because the
+deprecated attributes were templates and did not specify a concrete URL, the API
+could not provide a token that could be used for organization feeds.
+
+Starting today, the API returns empty values for the deprecated attributes.
+
+### New attribute for organization feeds
+
+In order to preserve the functionality of this API, we have added a new
+attribute that lists specific Atom feed urls for each of the user's
+organizations.
+
+<pre><code class="language-javascript">
+"current_user_organization_urls": [
+  "https://github.com/organizations/github/mastahyeti.private.atom?token=abc123"
+  "https://github.com/organizations/requests/mastahyeti.private.atom?token=token=def456"
+]
+</code></pre>
+
+Check out the updated [Feeds API documentation][docs] for the new fields. If you
+have any questions or feedback, please [get drop us a line][contact].
+
+[docs]: /v3/activity/feeds/
+[contact]: https://github.com/contact?form[subject]=Changing+organization+feeds+in+the+Feeds+API
diff --git a/content/v3/activity/feeds.md b/content/v3/activity/feeds.md
@@ -17,7 +17,7 @@ lists all the feeds available to the authenticating user:
 * **Current user public**: The public timeline for the authenticated user
 * **Current user**: The private timeline for the authenticated user
 * **Current user actor**: The private timeline for activity created by the authenticated user
-* **Current user organization**: The private timeline for the authenticated user for a given organization, using [URI template][]
+* **Current user organizations**: The private timeline for the organizations the authenticated user is a member of.
 
 **Note**: Private feeds are only returned when [authenticating via Basic
 Auth][authenticating] since current feed URIs use the older, non revokable auth
diff --git a/content/v3/versions.md b/content/v3/versions.md
@@ -97,6 +97,12 @@ The recommendations below will help you prepare your application for the next ma
 1. User attribute: gravatar_id
 : Recommendation: Use **avatar_url** instead.
 
+1. Feed attribute: current_user_organization_url
+: Recommendation: Use **current_user_organization_urls** instead.
+
+1. Feed attribute: current_user_organization
+: Recommendation: Use **current_user_organizations** instead.
+
 1. Pagination parameters `top` and `sha` for method: /repos/:owner/:repo/commits
 : Recommendation: When fetching [the list of commits for a repository](/v3/repos/commits/#list-commits-on-a-repository)
   use the [standard `per_page` and `page` parameters](/v3/#pagination) for pagination, instead of `per_page`,
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -1847,7 +1847,10 @@ def fetch_content(key)
       :current_user_public_url => "https://github.com/defunkt",
       :current_user_url => "https://github.com/defunkt.private?token=abc123",
       :current_user_actor_url => "https://github.com/defunkt.private.actor?token=abc123",
-      :current_user_organization_url => "https://github.com/organizations/{org}/defunkt.private.atom?token=abc123",
+      :current_user_organization_url => "",
+      :current_user_organization_urls => [
+        "https://github.com/organizations/github/defunkt.private.atom?token=abc123"
+      ],
       :_links => {
         :timeline => {
           :href => "https://github.com/timeline",
@@ -1870,9 +1873,15 @@ def fetch_content(key)
           :type => "application/atom+xml"
         },
         :current_user_organization => {
-          :href => "https://github.com/organizations/{org}/defunkt.private.atom?token=abc123",
-          :type => "application/atom+xml"
-        }
+          :href => "",
+          :type => ""
+        },
+        :current_user_organizations => [
+          {
+            :href => "https://github.com/organizations/github/defunkt.private.atom?token=abc123",
+            :type => "application/atom+xml"
+          }
+        ]
       }
     }
 
