synapses-cas 0.1.0 → 0.1.1

data/lib/casserver/server.rb

@@ -288,6 +288,8 @@ module CASServer
       init_authenticators!
     end
 
+    enable :sessions
+
     before do
       content_type :html, 'charset' => 'utf-8'
       @theme = settings.config[:theme]
@@ -295,11 +297,16 @@ module CASServer
       @uri_path = settings.config[:uri_path]
       @infoline = settings.config[:infoline]
       @custom_views = settings.config[:custom_views]
+      @default_locale = settings.config[:default_locale]
       @template_engine = settings.config[:template_engine] || :erb
       if @template_engine != :erb
         require @template_engine
         @template_engine = @template_engine.to_sym
       end
+
+      # Synapses CAS 0.1.1
+      session[:locale] = params[:locale] || session[:locale] ||  @default_locale
+
     end
 
     # The #.#.# comments (e.g. "2.1.3") refer to section numbers in the CAS protocol spec
@@ -326,7 +333,7 @@ module CASServer
       end
 
       if tgt and !tgt_error
-        @message = {:type => 'notice',
+        @message = {:type => 'info',
           :message => t.notice.logged_in_as(tgt.username)}
       elsif tgt_error
         $LOG.debug("Ticket granting cookie could not be validated: #{tgt_error}")
@@ -335,7 +342,7 @@ module CASServer
       end
 
       if params['redirection_loop_intercepted']
-        @message = {:type => 'mistake',
+        @message = {:type => 'error',
           :message => t.error.unable_to_authenticate}
       end
 
@@ -357,14 +364,14 @@ module CASServer
           end
         elsif @gateway
             $LOG.error("This is a gateway request but no service parameter was given!")
-            @message = {:type => 'mistake',
+            @message = {:type => 'error',
               :message => t.error.no_service_parameter_given}
         else
           $LOG.info("Proceeding with CAS login without a target service.")
         end
       rescue URI::InvalidURIError
         $LOG.error("The service '#{@service}' is not a valid URI!")
-        @message = {:type => 'mistake',
+        @message = {:type => 'error',
           :message => t.error.invalid_target_service}
       end
 
@@ -423,7 +430,7 @@ module CASServer
       end
 
       if error = validate_login_ticket(@lt)
-        @message = {:type => 'mistake', :message => error}
+        @message = {:type => 'error', :message => error}
         # generate another login ticket to allow for re-submitting the form
         @lt = generate_login_ticket.ticket
         status 500
@@ -475,7 +482,7 @@ module CASServer
 
           if @service.blank?
             $LOG.info("Successfully authenticated user '#{@username}' at '#{tgt.client_hostname}'. No service param was given, so we will not redirect.")
-            @message = {:type => 'confirmation', :message => t.notice.success_logged_in}
+            @message = {:type => 'success', :message => t.notice.success_logged_in}
           else
             @st = generate_service_ticket(@service, @username, tgt)
 
@@ -487,21 +494,21 @@ module CASServer
             rescue URI::InvalidURIError
               $LOG.error("The service '#{@service}' is not a valid URI!")
               @message = {
-                :type => 'mistake',
+                :type => 'error',
                 :message => t.error.invalid_target_service
               }
             end
           end
         else
           $LOG.warn("Invalid credentials given for user '#{@username}'")
-          @message = {:type => 'mistake', :message => t.error.incorrect_username_or_password}
+          @message = {:type => 'error', :message => t.error.incorrect_username_or_password}
           status 401
         end
       rescue CASServer::AuthenticatorError => e
         $LOG.error(e)
         # generate another login ticket to allow for re-submitting the form
         @lt = generate_login_ticket.ticket
-        @message = {:type => 'mistake', :message => e.to_s}
+        @message = {:type => 'error', :message => e.to_s}
         status 401
       end
 
@@ -560,7 +567,7 @@ module CASServer
         $LOG.warn("User tried to log out without a valid ticket-granting ticket.")
       end
 
-      @message = {:type => 'confirmation', :message => t.notice.success_logged_out}
+      @message = {:type => 'success', :message => t.notice.success_logged_out}
 
       @message[:message] += t.notice.click_to_continue if @continue_url
 

data/lib/casserver/views/layout.erb

@@ -1,18 +1,19 @@
 <%# coding: UTF-8 -%>
-<?xml version="1.0" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                       "XHTML1-s.dtd" >
 <html xmlns="http://www.w3.org/TR/1999/REC-html-in-xml"
       xml:lang="en" lang="en" >
 
   <head>
-    <title><%= escape_html @organization %><%= t.label.central_login_title %></title>
-    <link rel="stylesheet" type="text/css" href="<%= escape_html @uri_path %>/themes/cas.css" />
-    <link rel="stylesheet" type="text/css" href="<%= escape_html @uri_path %>/themes/<%= escape_html @theme %>/theme.css" />
+    <title><%= escape_html @organization %> <%= t.label.central_login_title %></title>
+    <link rel="stylesheet" type="text/css" href="<%= escape_html @uri_path %>/themes/<%= escape_html @theme %>/css/theme.css" />
+    <link rel="stylesheet" type="text/css" href="<%= escape_html @uri_path %>/themes/<%= escape_html @theme %>/css/extra.css" />
     <link rel="icon" type="image/png" href="<%= escape_html @uri_path %>/themes/<%= escape_html @theme %>/favicon.png" />
+    <script src="<%= escape_html @uri_path %>/js/jquery-1.7.1.min.js"></script>
+    <script src="<%= escape_html @uri_path %>/js/bootstrap.min.js"></script>
   </head>
 
-  <body onload="if (document.getElementById('username')) document.getElementById('username').focus()">
+<body>
     <%= yield %>
   </body>
 </html>

data/lib/casserver/views/login.erb

@@ -1,30 +1,39 @@
 <%# coding: UTF-8 -%>
-<table id="login-box">
-  <tr>
-    <td colspan="2">
-      <div id="headline-container">
-        <strong><%= escape_html @organization %></strong>
-        <%= t.label.central_login_title %>
+<div class="container">
+  <div class="content">
+    <div class="row">
+      <div class="login-form">
+        <div style="padding-bottom:15px;">
+        <img id="logo" src="<%= escape_html @uri_path %>/themes/<%= @theme %>/img/logo.png"/>
+        </div>
+        <% if @message %>
+        <div class="alert alert-<%= escape_html @message[:type] %>">
+          <button class="close" data-dismiss="alert">×</button>
+          <%= escape_html @message[:message] %>
+        </div>
+        <% end %>
+        <form method="post" action="<%= @form_action || "login" %>" id="login-form"
+              onsubmit="submitbutton = document.getElementById('login-submit'); submitbutton.value='<%= t.notice.please_wait %>'; submitbutton.disabled=true; return true;">
+          <fieldset>
+            <div class="clearfix">
+              <input type="text" id="username" name="username"  tabindex="1" accesskey="u"  placeholder="<%= t.label.username %>"/>
+            </div>
+            <div class="clearfix">
+              <input type="password" id="password" name="password" size="32" tabindex="2" accesskey="p" autocomplete="off" placeholder="<%= t.label.password %>" />
+            </div>
+            <input type="hidden" id="lt" name="lt" value="<%= escape_html @lt %>" />
+            <input type="hidden" id="service" name="service" value="<%= escape_html @service %>" />
+            <input type="submit" accesskey="l" value="<%= t.button.login %>" tabindex="4" id="login-submit" class="btn btn-primary"/>
+          </fieldset>
+        </form>
       </div>
-    </td>
-  </tr>
-
-  <% if @message %>
-  <tr>
-    <td colspan="2" id="messagebox-container">
-      <div class="messagebox <%= escape_html @message[:type] %>">
-        <%= escape_html @message[:message] %>
+      <div style="text-align:center">
+        <%= @infoline %><br/>
+        <% r18n.available_locales.each do |locale| %>
+            <a href="<%= @uri_path %>/login?locale=<%= locale.code%>"><img src="<%= escape_html @uri_path %>/flags/<%= locale.code %>.png"/></a>
+        <% end %>
       </div>
-    </td>
-  </tr>
-  <% end %>
-
-  <tr>
-    <td id="logo-container">
-      <img id="logo" src="<%= escape_html @uri_path %>/themes/<%= @theme %>/logo.png" />
-    </td>
-    <td id="login-form-container">
-      <%= erb(:_login_form, :layout => false) %>
-    </td>
-  </tr>
-</table>
+    </div>
+  </div>
+</div>
+<!-- /container -->

data/locales/en.yml

@@ -18,9 +18,9 @@ notice:
   please_wait: "Please wait..."
 
 label:
-  username: "Username"
+  username: "Email"
   password: "Password"
   central_login_title: "Central Login"
 
 button:
-  login: "LOGIN"
+  login: "Login"

data/locales/pt.yml

@@ -11,16 +11,16 @@ error:
   no_service_parameter_given: "O servidor não pode completar a solicitação porque não foi enviado o paramêtro do serviço."
 
 notice:
-  logged_in_as: "Você está logado como '%1'. Se este não for você, Por favor, faça o login a baixo."
+  logged_in_as: "Você está logado como '%1'."
   click_to_continue: "Por favor, clique no seguinte link para continuar:"
   success_logged_out: "Você saiu do sistema com sucesso."
   success_logged_in: "Login efetuado com sucesso."
   please_wait: "Aguarde ..."
 
 label:
-  username: "Usuário"
+  username: "Email"
   password: "Senha"
   central_login_title: "Central de Autenticação"
 
 button:
-  login: "ENTRAR"
+  login: "Entrar"