appoxy_rails 0.0.18 → 0.0.19

data/lib/appoxy_rails.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext'
+require_relative 'utils'
 require_relative 'appoxy_ui'
 require_relative 'appoxy_api'
 require_relative 'appoxy_sessions'

data/lib/railtie.rb

@@ -1,14 +1,21 @@
 # see http://api.rubyonrails.org/classes/Rails/Railtie.html
 
+# Nice write-up of hooking gems into the views/layouts/statics of Rails 3 apps: 
+# http://numbers.brighterplanet.com/2010/07/26/sharing-views-across-rails-3-apps/
+
 require 'rails'
 
-module SimpleWorker
-  class Railtie < Rails::Railtie
+module AppoxyRails
+  class Railtie < ::Rails::Railtie
 
     initializer "appoxy_rails.configure_rails_initialization" do |app|
       puts 'Initializing appoxy_rails Railtie'
 
 #      routes = app.routes
+#      app.paths.app.views.push Appoxy::Rails::Layout.view_path
+
+#        config.app_middleware.use '::ActionDispatch::Static', Appoxy::UI.public_path
+#        config.app.append_asset_paths
 
     end
   end

data/lib/sessions/application_controller.rb

@@ -5,7 +5,6 @@ module Appoxy
 
       def self.included(base)
         # Initialize module.
-        puts 'ApplicationController included.'
         base.helper_method :logged_in?
         base.helper_method :current_user
         base.helper_method :base_url
@@ -53,14 +52,22 @@ module Appoxy
 
 
       def current_user
-        @current_user ||= (login_from_session)
+        @current_user ||= login_from_session
         @current_user
       end
 
 
       def login_from_session
         #puts 'Login from session=' + session[:user_id].inspect
-        ::User.find_by_id(session[:user_id]) if session[:user_id]
+        u = nil
+        if session[:user_id]
+          begin
+            u = ::User.find(session[:user_id])
+          rescue => ex
+            puts 'User not found: ' + ex.message
+          end
+        end
+        u
       end
 
       def current_url
@@ -78,10 +85,7 @@ module Appoxy
       end
 
       def random_string(length=10)
-        chars    = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
-        password = ''
-        length.times { password << chars[rand(chars.size)] }
-        password
+        Appoxy::Utils.random_string(length)
       end
 
       def authenticate
@@ -100,9 +104,10 @@ module Appoxy
             end
           end
           redirect_to :controller=>"sessions", :action=>"new", :ac=>params[:ac]
+        else
+          after_authenticate
         end
 
-        after_authenticate
 
       end
 
@@ -111,9 +116,9 @@ module Appoxy
       end
 
 
-
       def facebook_oauth_url(options={})
-        puts 'appconfig==' + Rails.application.config.inspect
+#        puts 'appconfig==' + Rails.application.config.inspect
+        raise "Please config your facebook id and api keys." unless Rails.application.config.respond_to?(:facebook_app_id)
         raise "Scope must be specified." unless options[:scope]
         app_id = Rails.application.config.facebook_app_id
         if app_id

data/lib/sessions/sessions_controller.rb

@@ -135,8 +135,155 @@ module Appoxy
         destroy
       end
 
+      def openid_start
+
+        begin
+          identifier = params[:openid_identifier]
+          if identifier.nil?
+            flash[:warning] = "There is no openid identifier."
+            redirect_to root_path
+            return
+          end
+          oidreq = consumer.begin(identifier)
+        rescue OpenID::OpenIDError => e
+          flash[:error] = "Discovery failed for #{identifier}: #{e}"
+          redirect_to root_path
+          return
+        end
+        if true || params[:use_ax]
+          sregreq = OpenID::AX::FetchRequest.new
+          sregreq.add(OpenID::AX::AttrInfo.new("http://schema.openid.net/contact/email", "email", true))
+          oidreq.add_extension(sregreq)
+          oidreq.return_to_args['did_ax'] = 'y'
+        end
+        if params[:use_sreg]
+          sregreq = OpenID::SReg::Request.new
+          # required fields
+          sregreq.request_fields(['email', 'nickname'], true)
+          # optional fields
+          sregreq.request_fields(['dob', 'fullname'], false)
+          oidreq.add_extension(sregreq)
+          oidreq.return_to_args['did_sreg'] = 'y'
+        end
+        if params[:use_pape]
+          papereq = OpenID::PAPE::Request.new
+          papereq.add_policy_uri(OpenID::PAPE::AUTH_PHISHING_RESISTANT)
+          papereq.max_auth_age = 2*60*60
+          oidreq.add_extension(papereq)
+          oidreq.return_to_args['did_pape'] = 'y'
+        end
+        if params[:force_post]
+          oidreq.return_to_args['force_post']='x'*2048
+        end
+        return_to = base_url + "/sessions/openid_complete"
+        realm     = base_url
+
+        puts 'about to redirect'
+
+        if oidreq.send_redirect?(realm, return_to, params[:immediate])
+          url = oidreq.redirect_url(realm, return_to, params[:immediate])
+          puts 'yep, redirecting to ' + url
+#                response["x-test-yo"] = "fuck me"
+          redirect_to url
+        else
+          haml oidreq.html_markup(realm, return_to, params[:immediate], {'id' => 'openid_form'})
+        end
+#            dump_flash
+
+      end
+
+
+      def openid_complete
+
+        return if before_create == false
+
+        temp1       = session
+
+        current_url = base_url + "/sessions/openid_complete" # url_for(:action => 'complete', :only_path => false)
+        puts 'current_url=' + current_url.inspect
+        puts 'path_params=' + request.path_parameters.inspect
+        parameters = params.reject { |k, v| request.path_parameters[k.to_sym] }
+        puts 'PARAMETERS=' + parameters.inspect
+        oidresp = consumer.complete(parameters, current_url)
+        puts 'oidresp=' + oidresp.inspect
+        user_data = {}
+        case oidresp.status
+          when OpenID::Consumer::FAILURE
+            if oidresp.display_identifier
+              flash[:error] = ("Verification of #{oidresp.display_identifier} failed: #{oidresp.message}")
+            else
+              flash[:error] = "Verification failed: #{oidresp.message}"
+            end
+          when OpenID::Consumer::SUCCESS
+            logger.info ("Verification of #{oidresp.display_identifier} succeeded.")
+
+            user_data[:open_id] = oidresp.identity_url
+            if params[:did_ax]
+              sreg_resp    = OpenID::AX::FetchResponse.from_success_response(oidresp)
+              sreg_message = "AX Registration data was requested"
+              if sreg_resp.data.empty?
+                sreg_message << ", but none was returned."
+              else
+                sreg_message << ". The following data were sent:"
+                sreg_resp.data.each { |k, v|
+                  sreg_message << "<br/><b>#{k}</b>: #{v}"
+                }
+                user_data[:email] = sreg_resp.data["http://schema.openid.net/contact/email"][0]
+              end
+              puts sreg_message
+            end
+            if params[:did_sreg]
+              sreg_resp    = OpenID::SReg::Response.from_success_response(oidresp)
+              sreg_message = "Simple Registration data was requested"
+              if sreg_resp.empty?
+                sreg_message << ", but none was returned."
+              else
+                sreg_message << ". The following data were sent:"
+                sreg_resp.data.each { |k, v|
+                  sreg_message << "<br/><b>#{k}</b>: #{v}"
+                }
+
+              end
+              puts sreg_message
+            end
+            if params[:did_pape]
+              pape_resp    = OpenID::PAPE::Response.from_success_response(oidresp)
+              pape_message = "A phishing resistant authentication method was requested"
+              if pape_resp.auth_policies.member? OpenID::PAPE::AUTH_PHISHING_RESISTANT
+                pape_message << ", and the server reported one."
+              else
+                pape_message << ", but the server did not report one."
+              end
+              if pape_resp.auth_time
+                pape_message << "<br><b>Authentication time:</b> #{pape_resp.auth_time} seconds"
+              end
+              if pape_resp.nist_auth_level
+                pape_message << "<br><b>NIST Auth Level:</b> #{pape_resp.nist_auth_level}"
+              end
+              puts pape_message
+            end
+            # todo: CREATE A USER FOR THIS PROJECT HERE WITH IDENITY AND EMAIL
+            user = create_or_update_user(user_data)
+            if user
+              flash[:success] = "Authentication successful."
+            end
+
+          when OpenID::Consumer::SETUP_NEEDED
+            flash[:warning] = "Immediate request failed - Setup Needed"
+          when OpenID::Consumer::CANCEL
+            flash[:warning] = "OpenID transaction cancelled."
+          else
+        end
+#            dump_flash
+#        return_to = session[:return_to]
+#        puts 'return_to=' + return_to.inspect
+#        redirect_to (return_to || after_login_url || root_path)
+
+
+      end
 
       def create_facebook
+        return if before_create == false
         if facebook_auth(Rails.application.config.facebook_app_id,
                          Rails.application.config.facebook_secret)
           after_create
@@ -186,22 +333,40 @@ module Appoxy
             @user.save(:dirty=>true)
           end
 
-          set_current_user @user
-          @user
+          after_save_setup @user
 
         end
       end
 
-      def twitter_auth
-        callback_url = "#{base_url}/sessions/create_twitter"
-        @request_token          = twitter_oauth_consumer(:signin=>true).get_request_token(:oauth_callback => callback_url)
+      def oauth_start(key, secret, callback_url, site, request_token_path, authorize_path, access_token_path)
+        consumer                = oauth_consumer(key, secret,
+                                                 callback_url,
+                                                 site,
+                                                 request_token_path,
+                                                 authorize_path,
+                                                 access_token_path
+        )
+        @request_token          = consumer.get_request_token(:oauth_callback => callback_url)
         session[:request_token] = @request_token
-        ru                      = @request_token.authorize_url(:oauth_callback => callback_url)
-        puts ru.inspect
-        redirect_to ru
+        auth_url                = @request_token.authorize_url(:oauth_callback => callback_url)
+        puts auth_url.inspect
+        redirect_to auth_url
+      end
+
+      def twitter_auth
+        signin                  = true
+        callback_url            = "#{base_url}/sessions/#{(signin ? "create_twitter" : "create_twitter_oauth")}"
+        auth_path               = signin ? "authenticate" : "authorize"
+        consumer                = oauth_start(Rails.application.config.twitter_consumer_key, Rails.application.config.twitter_consumer_secret,
+                                                 callback_url,
+                                                 "https://api.twitter.com",
+                                                 "/oauth/request_token",
+                                                 "/oauth/#{auth_path}",
+                                                 "/oauth/access_token"
+        )
       end
 
-      # OAUTH VERSION
+      # OAUTH VERSION for oauthing, shouldn't be in this controller
       def create_twitter_oauth
         puts 'params=' + params.inspect
         @request_token = session[:request_token]
@@ -228,28 +393,34 @@ module Appoxy
 
       end
 
-      def create_twitter
-        before_create
-        puts 'params=' + params.inspect
+      def get_oauth_access_token
         @request_token = session[:request_token]
         @access_token  = @request_token.get_access_token(:oauth_verifier => params[:oauth_verifier])
         puts 'access_token = ' + @access_token.inspect
         p @access_token.params
+        @access_token
+      end
+
+      def create_twitter
+        return if before_create == false
+        puts 'params=' + params.inspect
+        get_oauth_access_token()
 
         @user = User.find_by_twitter_id(@access_token.params[:user_id])
         unless @user
-          @user = User.new(:username           =>@access_token.params[:screen_name],
-                           :twitter_screen_name=>@access_token.params[:screen_name],
-                           :twitter_id         =>@access_token.params[:user_id])
-          @user.save!
+          @user = User.new(# shouldn't set this, because can't say it will be unique ':username =>@access_token.params[:screen_name],
+          :twitter_screen_name=>@access_token.params[:screen_name],
+          :twitter_id         =>@access_token.params[:user_id])
+          @user.set_remember
+          @user.save
           puts '@user=' + @user.inspect
         else
           @user.username = @access_token.params[:screen_name]
+          @user.set_remember
           @user.save(:dirty=>true)
-
         end
 
-        set_current_user @user
+        after_save_setup @user
 
         flash[:success] = "Authorized with Twitter."
 
@@ -258,16 +429,69 @@ module Appoxy
       end
 
       private
-      def twitter_oauth_consumer(options={})
-        auth_path = options[:signin] ? "authenticate" : "authorize"
-        @consumer = OAuth::Consumer.new(Rails.application.config.twitter_consumer_key,
-                                        Rails.application.config.twitter_consumer_secret,
-                                        :site               => "https://api.twitter.com",
-                                        :oauth_callback     => "#{base_url}/sessions/#{(options[:signin] ? "create_twitter" : "create_twitter_oauth")}",
-                                        :request_token_path => "/oauth/request_token",
-                                        :authorize_path     => "/oauth/#{auth_path}",
-                                        :access_token_path  => "/oauth/access_token")
+
+      def after_save_setup(user)
+        if user.errors.present?
+          flash[:error] = "Error saving user: #{user.errors.full_messages}"
+          return false
+        else
+          set_user_cookies(user)
+          after_create
+          return user
+        end
+      end
+
+      def create_or_update_user(user_data)
+        user = User.find_by_email(user_data[:email]) # google returns different openid all the time so using email User.find_by_openid user_data[:openid]
+
+        unless user
+          user = User.new(user_data)
+          user.set_remember
+          user.save
+        else
+          if user.email.nil? || user.email != user_data[:email]
+            user.email = user_data[:email]
+          end
+#          if user.remember_me.nil? || user.remember_me_expires.nil? || user.remember_me_expires < Time.now
+#            logger.debug "Remember me expired."
+#            user.remember_me         = user_data[:remember_me]
+#            user.remember_me_expires = 30.days.since
+#          end
+          user.set_remember
+          user.save(:dirty=>true)
+        end
+
+#        puts 'user=' + user.inspect
+        return after_save_setup(user)
+      end
+
+      def set_user_cookies(user)
+        set_current_user(user)
+        response.set_cookie('user_id', :value => user.id, :expires => user.remember_expires)
+        response.set_cookie('rme', :value=>user.remember_me, :expires => user.remember_expires)
+      end
+
+
+      # todo: allow user to specify store type in options
+      def openid_consumer(options={})
+        @openid_consumer ||= OpenID::Consumer.new(session,
+                                                  OpenID::Store::Filesystem.new("/mnt/tmp/openid"))
+        # todo: add S3Store to appoxy_sessions
+        #            @openid_consumer ||= OpenID::Consumer.new(session,
+        #                                                      S3Store.new(S3BucketWrapper.new(context, main_bucket)))
+      end
+
+
+      def oauth_consumer(key, secret, callback, site, request_token_path, authorize_path, access_token_path)
+        @consumer = OAuth::Consumer.new(key,
+                                        secret,
+                                        :site               => site,
+                                        :oauth_callback     => callback,
+                                        :request_token_path => request_token_path,
+                                        :authorize_path     => authorize_path,
+                                        :access_token_path  => access_token_path)
         p @consumer
+        @consumer
       end
 
 

data/lib/sessions/user.rb

@@ -16,7 +16,7 @@ module Appoxy
                   {:name => :password, :hashed=>true},
                   :first_name,
                   :last_name,
-                  :remember_me,
+                  :remember_token,
                   :activation_code,
                   :status, # invited, active
                   :oauth_access_key,
@@ -25,18 +25,18 @@ module Appoxy
                   :lat, :lng
 
       has_dates :last_login,
-                :remember_me_expires
+                :remember_expires
 
 
       def validate
-        errors.add("email", "is not valid") unless User.email_is_valid?(email)
+#        errors.add("email", "is not valid") unless User.email_is_valid?(email)
 
         if status == "invited"
           # doesn't need password
         elsif open_id
           # doesn't need password
         else
-          errors.add("password", "must be at least 6 characters long.") if password.blank?
+#          errors.add("password", "must be at least 6 characters long.") if password.blank?
         end
       end
 
@@ -75,6 +75,12 @@ module Appoxy
         (self.password == password) ? self : nil
       end
 
+      def set_remember
+        rme_string            = random_string(50)
+        self.remember_token   = rme_string
+        self.remember_expires = 30.days.since
+      end
+
 
     end
 

data/lib/ui/application_helper.rb

@@ -91,7 +91,6 @@ module Appoxy
       end
 
       def flash_messages
-        puts 'FLASH MESSAGE!'
         if flash.size > 0
           s  = "<div class=\"flash_messages_container\">"
           s2 = ""

data/lib/utils.rb

@@ -0,0 +1,11 @@
+module Appoxy
+  module Utils
+    def self.random_string(length=10)
+      chars    = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
+      password = ''
+      length.times { password << chars[rand(chars.size)] }
+      password
+    end
+
+  end
+end

metadata

@@ -1,109 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: appoxy_rails
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 18
-  version: 0.0.18
+version: !ruby/object:Gem::Version
+  version: 0.0.19
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-07 00:00:00 -08:00
+date: 2011-02-17 00:00:00.000000000 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &26527800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *26527800
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &26527464 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-openid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *26527464
+- !ruby/object:Gem::Dependency
+  name: ruby-openid
+  requirement: &26527164 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: appoxy_api
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *26527164
+- !ruby/object:Gem::Dependency
+  name: appoxy_api
+  requirement: &26526828 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mini_fb
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *26526828
+- !ruby/object:Gem::Dependency
+  name: mini_fb
+  requirement: &26526480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simple_record
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *26526480
+- !ruby/object:Gem::Dependency
+  name: simple_record
+  requirement: &26526156 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *26526156
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - lib/api/api_controller.rb
 - lib/api/client.rb
 - lib/api/client_helper.rb
@@ -125,38 +106,31 @@ files:
 - lib/ui/test.rb
 - lib/ui/time_zoner.rb
 - lib/ui/visualizations.rb
+- lib/utils.rb
 - README.markdown
 has_rdoc: true
 homepage: http://www.appoxy.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Appoxy Rails Helper gem
 test_files: []
-