hotspotlogin 1.4.3 → 1.5.0

data/Changelog

@@ -1,3 +1,7 @@
+* 1.5.0 (2013-10-02)
+	* --password-recovery-url <URL>: (e.g.
+	https://accounts.mysite.com/password-recovery.html)
+
 * 1.4.3 (2013-09-26)
 	* cookie-based credentials persistance can be disallowed (but it is
 	enabled by default): --[no-]-remember-credentials option

data/README.rdoc

@@ -59,7 +59,9 @@ All this options may be put into the YAML config file specified by --conf
 
   --my-url <URL>                  "My Account" link, where -USER- will be replaced by 
                                   the actual username, e.g. 
-                                  http://accounts.mysite.com/?id=-USER- 
+                                  http://accounts.mysite.com/?id=-USER-
+
+  --password-recovery-url <URL>   e.g. http://accounts.mysite.com/password-recovery.html
 
   --[no-]remember-credentials     give users the possibility to store their credentials
                                   within a cookie in their own computer and avoid typing

data/examples/hotspotlogin.conf.yaml

@@ -13,3 +13,5 @@ logo: /some/path/to/mylogo.png
 logo-link: http://myorg.com
 my-url: http://accounts.myorg.com/?id=-USER- # -USER- will be dinamically replaced by real username
 favicon: /path/to/favicon.ico
+remember-credentials: false
+password-recovery-url: http://accounts.myorg.com/password-recovery.html

data/i18n/en.yml

@@ -29,3 +29,8 @@ status:
   upload_traffic: upload
   auto_updated_every: auto updated every
 remember_me: remember me
+password:
+  recovery:
+    any: password recovery
+    "you!": recover password
+  forgot: forgot password

data/i18n/it.yml

@@ -29,3 +29,9 @@ status:
   upload_traffic: upload
   auto_updated_every: "aggiornato automaticam. ogni"
 remember_me: ricordami
+password:
+  recovery:
+    any: recupero password
+    "you!": recupera password
+  forgot: password dimenticata
+

data/lib/hotspotlogin/app.rb

@@ -221,27 +221,27 @@ module HotSpotLogin
       erb(
         :hotspotlogin,
         :locals => {
-          :titel            => titel,
-          :headline         => headline, # like 'Logged out from HotSpot'
-          :bodytext         => bodytext,
-          :uamip            => params['uamip'],
-          :uamport          => params['uamport'],
-          :userurl          => params['userurl'],
-          #:redirurl        => params['redirurl'],
-          :redirurl         => params['userurl'],
-          :timeleft         => params['timeleft'], # legacy... 
-          :interval         => HotSpotLogin.config['interval'],
-          :signup_url       => HotSpotLogin.config['signup-url'],
-          :my_url           => HotSpotLogin.config['my-url'],
-          :remember_credentials => HotSpotLogin.config['remember-credentials'],
-          :custom_headline  => 
-              HotSpotLogin.config['custom-headline'], # like "MyOrg Name"
-          :custom_text      => HotSpotLogin.config['custom-text'],
-          :custom_footer    => HotSpotLogin.config['custom-footer'],
-          :logoext          => logoext,
-          :logo_link        => HotSpotLogin.config['logo-link'],
-          :result           => result,
-          :reply            => params['reply'] # Reply-Message
+          :titel                  => titel,
+          :headline               => headline, # like 'Logged out from HotSpot'
+          :bodytext               => bodytext,
+          :uamip                  => params['uamip'],
+          :uamport                => params['uamport'],
+          :userurl                => params['userurl'],
+          #:redirurl              => params['redirurl'],
+          :redirurl               => params['userurl'],
+          :timeleft               => params['timeleft'], # legacy... 
+          :interval               => HotSpotLogin.config['interval'],
+          :signup_url             => HotSpotLogin.config['signup-url'],
+          :my_url                 => HotSpotLogin.config['my-url'],
+          :password_recovery_url  => HotSpotLogin.config['password-recovery-url'],
+          :remember_credentials   => HotSpotLogin.config['remember-credentials'],
+          :custom_headline        => HotSpotLogin.config['custom-headline'], # like "MyOrg Name"
+          :custom_text            => HotSpotLogin.config['custom-text'],
+          :custom_footer          => HotSpotLogin.config['custom-footer'],
+          :logoext                => logoext,
+          :logo_link              => HotSpotLogin.config['logo-link'],
+          :result                 => result,
+          :reply                  => params['reply'] # Reply-Message
         }
       )
 

data/lib/hotspotlogin/app/helpers.rb

@@ -4,6 +4,7 @@ require 'hotspotlogin/constants'
 module HotSpotLogin
   class App < Sinatra::Base
     helpers do
+
       def logged_in?(result)
         [
           HotSpotLogin::Result::ALREADY,
@@ -12,6 +13,22 @@ module HotSpotLogin
         ].include? result
       end
       alias status_window? logged_in?
+
+      # Borrowed from / based on 
+      # https://github.com/gderosa/onboard/blob/8a1d331ca514cd22997a8f459c0f91d64f24158b/lib/onboard/controller/helpers/user-agent.rb#L6
+      #
+      # TODO: create a common gem? 8-)
+      #
+      # Thanks to http://detectmobilebrowsers.com 
+      # Specifically, based on http://detectmobilebrowsers.com/download/rails
+      #
+      def mobile?
+        return true if params['mobile'] =~ /yes|on|true|1/
+        return true if instance_variable_get :@mobile # may be not defined yet
+        return @mobile = /android.+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.match(request.user_agent) ||
+            /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.match(request.user_agent[0..3])
+      end
+
     end
   end
 end

data/lib/hotspotlogin/config.rb

@@ -60,6 +60,10 @@ module HotSpotLogin
         @@config['signup-url'] = url
       end
 
+      opts.on('--password-recovery-url URL', 'display an external link where end-user may recover/reset her password') do |url|
+        @@config['password-recovery-url'] = url
+      end
+
       opts.on('--[no-]remember-credentials', 'allow users to save username/password in cookies') do |rcred|
         @@config['remember-credentials'] = rcred
       end

data/lib/hotspotlogin/constants.rb

@@ -1,6 +1,6 @@
 module HotSpotLogin
 
-  VERSION = '1.4.3'
+  VERSION = '1.5.0'
 
   DEFAULT_CONFIG = {
     'listen-address'        => '0.0.0.0',

data/public/hotspotlogin/css/default.css

@@ -99,23 +99,20 @@ h2#headline {
   background: white;
 } */
 
-#signup-container{
+#signup-container, #password-recovery-container {
   font-style:italic;
   font-weight: normal;
-  margin-top:0.2em;
 }
 
-a#signup {
+a#signup  {
   border: none;
   color: white;
   background: #77f;
   padding: 0.2em 0.2em 0.1em 0.2em;
   font-style:normal;
-}
-
-a#signup {
   text-decoration: none;
   margin-left: 0.2em;
+  line-height: 2.4em;
   font-size: 130%;
 }
 

data/views/_login_form.erb

@@ -33,13 +33,17 @@
   </table>
 </form>
 <div style="height:1ex;"> <!-- separator --> </div>
-<% if signup_url =~ /\S/ %><span id="signup-container">
-  <%= t.account.dont_have.you.capitalize %>?
-  <% 
-    # DEBUG
-    # require 'pp'
-    # pp request.GET
-  %>
-  <a id="signup" href="<%= signup_url %>?redirect=<%= Rack::Utils.escape params['userurl'] %>"><%= t.signup.you!.capitalize %></a>
-</span><% end %>
+
+<% if signup_url =~ /\S/ %>
+  <span id="signup-container">
+    <%= t.account.dont_have.you.capitalize %>?
+    <a <%= 'target="_blank"' unless mobile? %> id="signup" href="<%= signup_url %>?redirect=<%= Rack::Utils.escape params['userurl'] %>"><%= t.signup.you!.capitalize %></a>
+  </span>
+<% end %>
+<% if password_recovery_url =~ /\S/ %>
+  <div id="password-recovery-container">
+    <%= t.password.forgot.capitalize %>?
+    <a id="password-recovery" href="<%= password_recovery_url %>?redirect=<%= Rack::Utils.escape params['userurl'] %>"><%= t.password.recovery.you!.capitalize.gsub(/\s/, '&nbsp;') %></a>
+  </div>
+<% end %>
 

data/views/hotspotlogin.erb

@@ -53,8 +53,9 @@
         :_login_form,
         :layout => false,
         :locals => {
-          :signup_url => signup_url,
-          :remember_credentials => remember_credentials,
+          :signup_url             => signup_url,
+          :remember_credentials   => remember_credentials,
+          :password_recovery_url  => password_recovery_url
         }
       )  
     %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotspotlogin
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets