fixing openid account

controller/account.rb

@@ -10,15 +10,16 @@ def login
     end
 
     return unless request.post?
+    @oid = session[:openid_identity]
+    @url = request[:url] || @oid
 
-    openid = request[:openid].to_s.strip
-
-    if $rapaste[:users].include?(openid)
-      session[:openid] = openid
-      redirect Rs(:after_login)
+    if @oid
+      openid_finalize
+    elsif request.post?
+      openid_begin
+    else
+      flash[:bad] = flash[:error] || "Bleep"
     end
-
-    redirect_referrer
   end
 
   # This method is simply to check whether we really did login and the browser
@@ -27,9 +28,21 @@ def login
   # site.
   def after_login
     if logged_in?
-      answer R(ProfileController, user.login)
+      answer R(SpamController, :list_pending)
     else
       redirect Rs(:login, :fail => :session)
     end
   end
+
+  private
+
+  def openid_finalize
+    if $rapaste[:users].include?(@oid)
+      session[:user] = @oid
+      flash[:good] = flash[:success]
+      redirect R(SpamController, :list_pending)
+    else
+      flash[:bad] = "None of our users belongs to this OpenID"
+    end
+  end
 end

controller/spam.rb

@@ -5,7 +5,7 @@ class SpamController < Ramaze::Controller
   layout '/layout'
 
   before_all do
-    redirect_referrer unless session[:openid]
+    redirect_referrer unless $rapaste[:users].include?(session[:openid_identity])
   end
 
   def list_pending

view/css/screen.sass

@@ -170,7 +170,7 @@ pre
     :text-align center
     fieldset
       :border 1px solid #eee
-      :background #fff
+      // :background #fff
       legend
         :font-size 1.5em
       label

view/layout.haml

@@ -1,5 +1,5 @@
 !!! XML
-!!! 
+!!!
 
 %html
   %head
@@ -19,7 +19,10 @@
           %input{:type => :text, :name => :substring}
         %a{:href => '/'} New
         %a{:href => '/list'} List
-        %a{:href => R(AccountController, :login)} Login
+        - if session[:user]
+          %a{:href => R(AccountController, :logout)} Logout
+        - else
+          %a{:href => R(AccountController, :login)} Login
       #flash= flashbox
     #content= @content
     #footer