Login

From a76a0c8d8ee259f1818a5fa2b5c4986fa460d888 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Wed, 25 May 2011 13:59:53 +0200 Subject: re-enabled cookie-authentication for html-access to webservices, replaced login/logout with sign in/out to avoid name clash with toxcreate --- lib/to-html.rb | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/to-html.rb b/lib/to-html.rb index 51602d7..2c29f7d 100644 --- a/lib/to-html.rb +++ b/lib/to-html.rb @@ -36,11 +36,11 @@ module OpenTox user = OpenTox::Authorization.get_user(subjectid) if subjectid html += "

"
       unless user
-        html += "You are currently not logged in to "+$url_provider.url_for("",:full)+
-          ", login"
+        html += "You are currently not signed in to "+$url_provider.url_for("",:full)+
+          ", sign in"
       else
-        html += "You are logged in as '#{user}' to "+$url_provider.url_for("",:full)+
-          ", logout"
+        html += "You are signed in as '#{user}' to "+$url_provider.url_for("",:full)+
+          ", sign out"
       end
       html += "

" end @@ -67,46 +67,44 @@ module OpenTox html end - def self.login( msg=nil ) + def self.sign_in( msg=nil ) html = "Login

" - html += "

" + html += "" html += "

"
     html += msg+"\n\n" if msg
-    html += "Please login to "+$url_provider.url_for("",:full)+"\n\n"
+    html += "Please sign in to "+$url_provider.url_for("",:full)+"\n\n"
     html += ""
     html += ""+
           ""+
           #""+
-          ""
+          ""
     html += "user: 
password:

" html end end -=begin -get '/logout/?' do +get '/sign_out/?' do response.set_cookie("subjectid",{:value=>nil}) content_type "text/html" - content = "Sucessfully logged out from "+$url_provider.url_for("",:full) + content = "Sucessfully signed out from "+$url_provider.url_for("",:full) OpenTox.text_to_html(content) end -get '/login/?' do +get '/sign_in/?' do content_type "text/html" - OpenTox.login + OpenTox.sign_in end -post '/login/?' do +post '/sign_in/?' do subjectid = OpenTox::Authorization.authenticate(params[:user], params[:password]) if (subjectid) response.set_cookie("subjectid",{:value=>subjectid}) content_type "text/html" - content = "Sucessfully logged in as '"+params[:user]+"' to "+$url_provider.url_for("",:full) + content = "Sucessfully signed in as '"+params[:user]+"' to "+$url_provider.url_for("",:full) OpenTox.text_to_html(content,subjectid) else content_type "text/html" - OpenTox.login("Login failed, please try again") + OpenTox.sign_in("Login failed, please try again") end end -=end -- cgit v1.2.3

user:
password: