sharkapps 0.1.15 → 0.1.16

data/Gemfile

@@ -12,5 +12,5 @@ group :development do
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
 end
-
-  gem 'rabl'
+gem 'rabl'
+gem 'koala'

data/Gemfile.lock

@@ -28,16 +28,24 @@ GEM
       activemodel (= 3.0.9)
       activesupport (= 3.0.9)
     activesupport (3.0.9)
+    addressable (2.2.7)
     arel (2.0.10)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    koala (1.4.0)
+      faraday (~> 0.7.0)
+      multi_json (~> 1.0)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -45,6 +53,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     multi_json (1.3.2)
+    multipart-post (1.1.5)
     polyglot (0.3.2)
     rabl (0.6.9)
       activesupport (>= 2.3.14)
@@ -85,6 +94,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  koala
   rabl
   rails (>= 3.0.9)
   rcov

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/config/routes.rb

@@ -3,6 +3,7 @@ Rails.application.routes.draw do
   match 'locale_selector' => 'appforma#locale_selector', :as => :locale_selector
   match 'not_subscribed' => 'appforma#not_subscribed', :as => :not_subscribed
   match 'not_authorized' => 'appforma#not_authorized', :as => :not_authorized
+  match 'auth_check' => 'appforma#auth_check', :as => :site_auth_check
   
   #API routes
   scope "/api/v1" do

data/lib/sharkapps.rb

@@ -106,7 +106,35 @@ module SharkApps
     end
     
     def check_admin
-      redirect_to not_authorized_url(:id => @account.acc_hash) unless is_admin
+      #check that we have a Facebook user. if not, redirect.
+      @oauth = Koala::Facebook::OAuth.new(Facebooker2.app_id, Facebooker2.secret)
+      
+      #returning from the oauth server
+  	  if params[:code] and session[:access_token].nil?
+  	    @access_token = @oauth.get_access_token(params[:code], :redirect_uri => session[:redirect_uri])
+  	    session[:redirect_uri] = nil
+  	    session[:access_token] = @access_token
+  	  end
+  	  
+  	  #no access token stored - do a redirect
+  	  unless session[:access_token]
+  	    session[:redirect_uri] = request.url
+  	    redirect_to @oauth.url_for_oauth_code(:permissions => "publish_stream, manage_pages, email", :redirect_uri => request.url) and return
+  	  end
+  	  
+  	  #validate that the access token that we have is good. if not, request a new one.
+  	  begin
+  	    fb = current_fb_user
+  	  rescue Exception
+  	    session[:redirect_uri] = request.url
+  	    session[:access_token] = nil
+  	    redirect_to @oauth.url_for_oauth_code(:permissions => "publish_stream, manage_pages, email", :redirect_uri => request.url) and return
+  	  end
+  	  
+  	  #we have an access token, we can do the is_admin check now
+      unless session[:access_token].nil?
+          redirect_to not_authorized_url(:id => @account.acc_hash) unless is_admin
+      end
     end
     
     def is_admin
@@ -124,12 +152,33 @@ module SharkApps
         need_check = (session[sym].nil? or session[sym] == false)
         puts "need check: = #{need_check}"
         if need_check #need_check
-          return false if current_facebook_user.nil?
-          session[sym] = AppformaAccount.check_admin_authorized(@account, current_facebook_user.id)
+          return false if current_fb_user.nil?
+          session[sym] = AppformaAccount.check_admin_authorized(@account, current_fb_user['id'])
         end
         return session[sym]
       end    
     end
+    
+    def facebook_session_from_cookies
+      puts "request cookies = #{request.cookies}"
+      oauth = Koala::Facebook::OAuth.new(Facebooker2.app_id, Facebooker2.secret)
+      facebook_session = oauth.get_user_info_from_cookies(request.cookies)
+      facebook_session
+    end
+    
+    def facebook_user_from_cookies
+      facebook_session = facebook_session_from_cookies
+      @facebook_user = Koala::Facebook::API.new(facebook_session["access_token"]).get_object("me") if facebook_session
+      @access_token = facebook_session["access_token"] if facebook_session
+      @facebook_user
+    end
+    
+    def current_fb_user
+      return @current_fb_user if @current_fb_user
+      @current_fb_user = Koala::Facebook::API.new(session[:access_token]).get_object("me") if session[:access_token]
+      @current_fb_user
+    end
+    
                
   end
   

data/sharkapps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sharkapps}
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eyal Kedem"]
-  s.date = %q{2012-05-28}
+  s.date = %q{2012-06-03}
   s.description = %q{integration utilities with the shark apps framework}
   s.email = %q{ekedem@gmail.com}
   s.extra_rdoc_files = [
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rabl>, [">= 0"])
+      s.add_runtime_dependency(%q<koala>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.9"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -73,6 +74,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rabl>, [">= 0"])
+      s.add_dependency(%q<koala>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.9"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -81,6 +83,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rabl>, [">= 0"])
+    s.add_dependency(%q<koala>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.0.9"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sharkapps
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 1
-  - 15
+  - 16
   segments_generated: true
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors: 
 - Eyal Kedem
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 +03:00
+date: 2012-06-03 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,8 +35,23 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: koala
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id002
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +63,12 @@ dependencies:
         - 9
         segments_generated: true
         version: 3.0.9
-  requirement: *id002
+  requirement: *id003
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +78,12 @@ dependencies:
         - 0
         segments_generated: true
         version: "0"
-  requirement: *id003
+  requirement: *id004
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +95,12 @@ dependencies:
         - 0
         segments_generated: true
         version: 1.0.0
-  requirement: *id004
+  requirement: *id005
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,12 +112,12 @@ dependencies:
         - 2
         segments_generated: true
         version: 1.5.2
-  requirement: *id005
+  requirement: *id006
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,7 +127,7 @@ dependencies:
         - 0
         segments_generated: true
         version: "0"
-  requirement: *id006
+  requirement: *id007
   prerelease: false
   type: :development
 description: integration utilities with the shark apps framework