facebook_app 0.0.30 → 0.0.32

data/app/controllers/facebook_app/admin_controller.rb

@@ -1,18 +1,22 @@
 module FacebookApp
   class AdminController < FacebookAppController 
     layout "facebook_app"
-    http_basic_authenticate_with :name => 'identified', :password => 'identified'
-    before_filter :ensure_logged_in, :only => :log_me_out
-    before_filter :load_graph, :only => :log_me_out
+    http_basic_authenticate_with :name => 'identified', :password => 'identified', :except => :register_app_access_token
+    before_filter :load_graph, :only => :uninstall_app
+
 
     def show
       @conversion_summary = FacebookApp::ConversionSummary.new
-
       @fb = FacebookApp::FacebookCredentials.current_credentials
     end
 
     def new_fb_credentials 
-      @fb = FacebookApp::FacebookCredentials.new
+      @fb = FacebookApp::FacebookCredentials.current_credentials
+    end
+
+    def register_app_access_token 
+      FacebookApp::FacebookCredentials.register_app_access_token
+      render :js => "alert('App access token successfully registered as #{FacebookApp::FacebookCredentials.app_access_token}');".html_safe
     end
 
     def clear_conversion_data
@@ -20,14 +24,12 @@ module FacebookApp
       redirect_to facebook_app.admin_path
     end
 
-    def log_me_out
-      @graph.graph_call("#{@graph.get_object('me')['id']}/permissions", {}, :delete)
-
+    def uninstall_app
       session[:at] = nil
       session[:uid] = nil
       cookies.delete(:conversion_id)
       flash[:notice] = "You logged out as a Facebook user"
-      redirect_to facebook_app.admin_path
+      redirect_to :back 
     end
 
     def create_fb_credentials

data/app/helpers/facebook_app/facebook_sdk_helper.rb

@@ -32,13 +32,14 @@ module FacebookSdkHelper
     javascript_tag("FB.getUserID()")
   end
 
-# Configurable[:facebook_permissions]
   def facebook_login(text, permissions, log_in_url)
     link_to(text, "#", :onclick => "facebookLogin('#{permissions}', '#{log_in_url}'").html_safe
   end
 
   def uninstall_facebook_app_button
-    button_to_function("Uninstall This Facebook App", "removeAppPermissions()")
+    # hackish fix for route since engine in Rails 3.1 tries to double up
+    # the initial backslash
+    button_to("Uninstall App and Logout", facebook_app.uninstall_app_path.gsub("//","/"), :onclick => "removeAppPermissions()")
   end
 
   def facebook_logout_button

data/app/models/facebook_app/facebook_credentials.rb

@@ -31,6 +31,15 @@ module FacebookApp
         current_credentials.secret
       end
 
+      def app_access_token
+        current_credentials.app_access_token || register_app_access_token
+      end
+
+      def register_app_access_token
+        oauth = Koala::Facebook::OAuth.new(FacebookApp::FacebookCredentials.app_id, FacebookApp::FacebookCredentials.secret)
+        FacebookApp::FacebookCredentials.current_credentials.update_attribute(:app_access_token, oauth.get_app_access_token)
+      end
+
       def app_url
         current_credentials.app_url
       end

data/app/views/facebook_app/admin/show.html.slim

@@ -6,9 +6,8 @@
   = button_to "Delete Data", facebook_app.clear_conversion_data_path, :confirm => "Are you sure you want to permanently delete all conversion data?"
   p Remove app permission. Useful for checking if permissions dialogue shows at right time. Will log you in if you are logged out.
   = uninstall_facebook_app_button 
-  p Register Achievements With Facebook(must be done with each new app)
-  = button_to "Register Achivements", facebook_app.register_with_fb_achievement_path(1) 
-
+  p Register With Facebook(must be done with each new app)
+  = button_to "Register App Access Token & Achivements", facebook_app.register_app_access_token_path, :remote => true
   ul 
      li
   h1 Current Facebook Credentials

data/config/routes.rb

@@ -1,15 +1,11 @@
 FacebookApp::Engine.routes.draw do
 
   scope(:module => :facebook_app) do
-    resources :achievements do
-      member do
-        post :register_with_fb
-      end
-    end
 
     get "/channel" => "facebook_sdk#channel", :as => :facebook_channel
 
     post "/trackings" => "trackings#create", :as => :trackings
+    post "/register_app_access_token" => "admin#register_app_access_token", :as => :register_app_access_token
 
     match "/oauth_callback" => "oauth#create", :as => :oauth_callback
     match "/denied" => "oauth#denied", :as => :denied
@@ -19,7 +15,7 @@ FacebookApp::Engine.routes.draw do
 
     get "/admin" => "admin#show"
     post "/admin/clear_conversion_data" => "admin#clear_conversion_data", :as => :clear_conversion_data
-    post "/admin/log_me_out" => "admin#log_me_out", :as => :log_me_out
+    post "/admin/uninstall_app" => "admin#uninstall_app", :as => :uninstall_app
 
     post "/create_fb_credentials" => "admin#create_fb_credentials"
     get "/new_fb_credentials" => "admin#new_fb_credentials"

data/db/migrate/20111024214949_add_facebook_app.rb

@@ -23,6 +23,8 @@ class AddFacebookApp < ActiveRecord::Migration
       t.boolean "development", :default => false
       t.string  "email"
       t.string  "password"
+      # we have logic that creates the token if false
+      t.string "app_access_token", :default => false
     end
   end
 

data/lib/facebook_app/version.rb

@@ -1,3 +1,3 @@
 module FacebookApp
-  VERSION = "0.0.30"
+  VERSION = "0.0.32"
 end

metadata

@@ -2,7 +2,7 @@
 name: facebook_app
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.30
+  version: 0.0.32
 platform: ruby
 authors: 
 - Jack Kinsella