*** openid_login_generator.rb.org       2008-09-15 00:41:13.000000000 +0900
--- openid_login_generator.rb   2008-09-15 00:41:28.000000000 +0900
***************
*** 14,20 ****
        m.template "users.yml", "test/fixtures/users.yml"

        # Layout and stylesheet.
!       m.template "scaffold:layout.rhtml", "app/views/layouts/scaffold.rhtml"
        m.template "scaffold:style.css", "public/stylesheets/scaffold.css"

        # Views.
--- 14,20 ----
        m.template "users.yml", "test/fixtures/users.yml"

        # Layout and stylesheet.
!       m.template "scaffold:layout.html.erb", "app/views/layouts/scaffold.html.erb"
        m.template "scaffold:style.css", "public/stylesheets/scaffold.css"

        # Views.

*** app/views/authn/login.rhtml.org	2008-09-15 00:45:46.000000000 +0900
--- app/views/authn/login.rhtml	2008-09-15 00:45:59.000000000 +0900
***************
*** 1,4 ****
! <%= start_form_tag :action=> "login" %>
  
  <div title="Account login" id="loginform" class="form">
      <h3>Please login</h3>
--- 1,4 ----
! <% form_tag :action=> "login" do %>
  
  <div title="Account login" id="loginform" class="form">
      <h3>Please login</h3>
***************
*** 11,15 ****
  
  </div>
  
! <%= end_form_tag %>
  
--- 11,15 ----
  
  </div>
  
! <% end %>

*** app/controllers/authn_controller.rb.org	2008-09-15 00:43:51.000000000 +0900
--- app/controllers/authn_controller.rb	2008-09-15 06:09:31.000000000 +0900
***************
*** 2,13 ****
  require "cgi"
  
  # load the openid library
! begin
!   require "rubygems"
!   require_gem "ruby-openid", ">= 1.0.2"
! rescue LoadError
!   require "openid"
! end
  
  class AuthnController < ApplicationController
    layout  'scaffold'
--- 2,9 ----
  require "cgi"
  
  # load the openid library
! require "openid"
! require "openid/store/filesystem"
  
  class AuthnController < ApplicationController
    layout  'scaffold'
***************
*** 15,27 ****
    # process the login request, disover the openid server, and
    # then redirect.
    def login
!     openid_url = @params[:openid_url]
! 
!     if @request.post?
!       request = consumer.begin(openid_url)
  
!       case request.status
!       when OpenID::SUCCESS
          return_to = url_for(:action=> 'complete')
          trust_root = url_for(:controller=>'')
  
--- 11,21 ----
    # process the login request, disover the openid server, and
    # then redirect.
    def login
!     openid_url = params[:openid_url]
  
!     if request.post?
!       begin
!         request = consumer.begin(openid_url)
          return_to = url_for(:action=> 'complete')
          trust_root = url_for(:controller=>'')
  
***************
*** 29,41 ****
          redirect_to(url)
          return
  
!       when OpenID::FAILURE
          escaped_url = CGI::escape(openid_url)
          flash[:notice] = "Could not find OpenID server for #{escaped_url}"
-         
-       else
-         flash[:notice] = "An unknown error occured."
- 
        end      
      end    
  
--- 23,31 ----
          redirect_to(url)
          return
  
!       rescue => e
          escaped_url = CGI::escape(openid_url)
          flash[:notice] = "Could not find OpenID server for #{escaped_url}"
        end      
      end    
  
***************
*** 43,54 ****
  
    # handle the openid server response
    def complete
!     response = consumer.complete(@params)
      
      case response.status
!     when OpenID::SUCCESS
  
!       @user = User.get(response.identity_url)
        
        # create user object if one does not exist
        if @user.nil?
--- 33,46 ----
  
    # handle the openid server response
    def complete
!     current_url = url_for(:action => 'complete')
!     parameters = params.reject{|k,v|request.path_parameters[k]}
!     response = consumer.complete(parameters, current_url)
      
      case response.status
!     when OpenID::Consumer::SUCCESS
  
!       @user = User.find_by_openid_url(response.identity_url)
        
        # create user object if one does not exist
        if @user.nil?
***************
*** 58,71 ****
  
        # storing both the openid_url and user id in the session for for quick
        # access to both bits of information.  Change as needed.
!       @session[:user_id] = @user.id
  
        flash[:notice] = "Logged in as #{CGI::escape(response.identity_url)}"
         
        redirect_to :action => "welcome"
        return
  
!     when OpenID::FAILURE
        if response.identity_url
          flash[:notice] = "Verification of #{CGI::escape(response.identity_url)} failed."
  
--- 50,63 ----
  
        # storing both the openid_url and user id in the session for for quick
        # access to both bits of information.  Change as needed.
!       session[:user_id] = @user.id
  
        flash[:notice] = "Logged in as #{CGI::escape(response.identity_url)}"
         
        redirect_to :action => "welcome"
        return
  
!     when OpenID::Consumer::FAILURE
        if response.identity_url
          flash[:notice] = "Verification of #{CGI::escape(response.identity_url)} failed."
  
***************
*** 97,105 ****
      # create the OpenID store for storing associations and nonces,
      # putting it in your app's db directory
      store_dir = Pathname.new(RAILS_ROOT).join('db').join('openid-store')
!     store = OpenID::FilesystemStore.new(store_dir)
  
!     return OpenID::Consumer.new(@session, store)
    end
  
    # get the logged in user object
--- 89,97 ----
      # create the OpenID store for storing associations and nonces,
      # putting it in your app's db directory
      store_dir = Pathname.new(RAILS_ROOT).join('db').join('openid-store')
!     store = OpenID::Store::Filesystem.new(store_dir)
  
!     return OpenID::Consumer.new(session, store)
    end
  
    # get the logged in user object