<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,7 +1,3 @@
-# &#9888; DANGER WILL ROBINSON
-
-[Yammer has changed their OAuth authorization procedure.](https://www.yammer.com/api_oauth_security_addendum.html) Laika has not yet been updated to support this change, as it will apparently require changes to the underlying Ruby OAuth library. Contributions toward this end are welcome, but until this gets sorted out, _Laika will almost certainly not be able to authorize itself to Yammer._ (According to Yammer, existing authorizations should not be affected.)
-
 # Laika
 
 ## Description
@@ -22,7 +18,7 @@ Then, you'll need to do the OAuth exchange, which will give you an access token
 
     laika-auth
 
-This will prompt you for the client key and secret you just obtained. It will then echo a URL which you will need to visit while still logged in to Yammer as the user from the previous step. You'll be asked to authorize your application. Click the Authorize button, then go back to your terminal and hit Return. The script will then get the access token and secret from Yammer, and store all four pieces of information in a file called laika.yml. **Don't lose this file!** It constitutes the credentials that you will need to do anything useful with Laika. It is not encrypted, so keep it secure. Once you have the laika.yml file, you will not need to do these steps again unless you de-authorize the application.
+This will prompt you for the client key and secret you just obtained. It will then echo a URL which you will need to visit while still logged in to Yammer as the user from the previous step. You'll be asked to authorize your application. Click the Authorize button. Yammer will give you a four-character security code. Go back to your terminal, enter that code and hit Return. The script will then get the access token and secret from Yammer, and store all four pieces of information in a file called laika.yml. **Don't lose this file!** It constitutes the credentials that you will need to do anything useful with Laika. It is not encrypted, so keep it secure. Once you have the laika.yml file, you will not need to do these steps again unless you de-authorize the application.
 
 Now you're ready to start barking about feeds. You can see all Laika's options by running it with the --help option:
 </diff>
      <filename>README.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -12,9 +12,13 @@ consumer_secret = gets.chomp
 begin
   consumer = OAuth::Consumer.new consumer_key, consumer_secret, { :site =&gt; &quot;https://www.yammer.com&quot; } 
   request_token = consumer.get_request_token
-  puts &quot;Please go to:\n#{request_token.authorize_url}\nin your browser. Click Authorize on that page.\nHit Return here when you are done.&quot;
-  gets
-  access_token = request_token.get_access_token
+  puts &quot;Please go to:\n#{request_token.authorize_url}\nin your browser to authorize your application.&quot;
+  puts &quot;You should receive a four-character security code.\nEnter it and hit Return here when you are done.&quot;
+  callback_token =  gets
+  response = consumer.token_request(consumer.http_method,
+                                   (consumer.access_token_url? ? consumer.access_token_url : consumer.access_token_path),
+                                    request_token, {}, :callback_token =&gt; callback_token.chomp)
+  access_token = OAuth::AccessToken.new(consumer,response[:oauth_token],response[:oauth_token_secret])
   credentials = {
     :consumer_key =&gt; consumer.key,
     :consumer_secret =&gt; consumer.secret,</diff>
      <filename>bin/laika-auth</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5a226c82cd16b40323f7b5b24a45d80bb93f99f0</id>
    </parent>
  </parents>
  <author>
    <name>Mark Cornick</name>
    <email>mcornick@gmail.com</email>
  </author>
  <url>http://github.com/vigetlabs/laika/commit/2400b94a1a4104c5622c7b927abe18183c2d72e7</url>
  <id>2400b94a1a4104c5622c7b927abe18183c2d72e7</id>
  <committed-date>2009-08-06T14:05:16-07:00</committed-date>
  <authored-date>2009-08-06T14:05:16-07:00</authored-date>
  <message>finally fix the OAuth dance, thanks to http://github.com/jstewart/yammer4r for clues</message>
  <tree>8020bbe24e28ec3b18a47e44cc30f24946ab7bf5</tree>
  <committer>
    <name>Mark Cornick</name>
    <email>mcornick@gmail.com</email>
  </committer>
</commit>
