Implement automatic OAuth setup for Potlatch 2

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 9474a01370ea692bf14e22c5585c4ddb3a34c0e7..09eec40d3e5f020a4445282a485a312d98a6590c 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -2,6 +2,7 @@ require 'oauth'
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken"
+  has_many :access_tokens
   validates_presence_of :name, :url, :key, :secret
   validates_uniqueness_of :key
   before_validation_on_create :generate_keys
@@ -53,6 +54,20 @@ class ClientApplication < ActiveRecord::Base
     RequestToken.create :client_application => self, :callback_url => self.token_callback_url
   end
 
+  def access_token_for_user(user)
+    unless token = access_tokens.find(:first, :conditions => { :user_id => user.id, :invalidated_at => nil })
+      params = { :user => user }
+
+      permissions.each do |p|
+        params[p] = true
+      end
+
+      token = access_tokens.create(params)
+    end
+    
+    token
+  end
+
   # the permissions that this client would like from the user
   def permissions
     ClientApplication.all_permissions.select { |p| self[p] }

diff --git a/app/models/user.rb b/app/models/user.rb
index ecf93b6f790f5505d78ccaab1905e7e5827dec17..1db8adab7fcea045f4b1a05516859a57aa579043 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -203,4 +203,10 @@ class User < ActiveRecord::Base
 
     return score.to_i
   end
+
+  ##
+  # return an oauth access token for a specified application
+  def access_token(application_key)
+    return ClientApplication.find_by_key(application_key).access_token_for_user(self)
+  end
 end

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 705b9139c28b2c2373dbefb356f8575ffc99b6cd..5b072476396e9fa9be3aa308d26ab315edd5e3bf 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -3,6 +3,9 @@
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
+
+<% token = @user.access_token(POTLATCH2_KEY) %>
+
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
   var fo = new SWFObject("/potlatch2/potlatch2.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "9", "#FFFFFF");
@@ -22,9 +25,13 @@
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }
     fo.addVariable("zoom",zoom);
-    fo.addVariable("api","/api/<%= API_VERSION %>/");
-    fo.addVariable("policy","/api/crossdomain.xml");
+    fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
     fo.addVariable("connection","XML");
+    fo.addVariable("oauth_token","<%= token.token %>");
+    fo.addVariable("oauth_token_secret","<%= token.secret %>");
+    fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
+    fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
     fo.write("map");
   }
 

diff --git a/config/example.application.yml b/config/example.application.yml
index 5533b51956a95749d690f07fb008437bc4a22c96..c88d894a0773980e6ba8569472c30e30e79e9ce5 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -59,6 +59,8 @@ standard_settings: &standard_settings
   nominatim_url: "http://nominatim.openstreetmap.org/"
   # Default editor
   default_editor: "potlatch"
+  # OAuth consumer key for Potlatch 2
+  #potlatch2_key: ""
 
 development:
   <<: *standard_settings