mumukit-login 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530d05ac3f8ee75a1f62636d207e3e1e0d0cf2656baabeb00fc164d2b33ce16c
-  data.tar.gz: 775dc86c376521e20031fa417a02c58c74af408a085de8352f4b87b372a55470
+  metadata.gz: 5b5be25c21177e55c4a3b2ba04046182c900a93ecb1158a12622cc02a1d162c9
+  data.tar.gz: 2650fddd7ccf2ce77587af1f339e405cf3a548775cc68a51a186fceace371e94
 SHA512:
-  metadata.gz: 3e8da78641b2b30ad0f73af0ef4818e2af7047d4594278a9cf9a0e4549056ee4e218ce1c87ece0337fdc5adfeaeab0f041e2003267532fbef8c3df0db5a8f27f
-  data.tar.gz: 7da2ff5c12e5bb9b1cedce0b84b2c323cb84026638ffd462810b7630dc249950f8fc8b4a5d4ff6acbacb67496c8444b2b528940ef002c21e847f9c4d6b1e5761
+  metadata.gz: c563acf6dd8b69929feaca22bde4794647b6a73ae8e8894f75daad5495bcb1b1aaf136d7176eff8c45c77669391780e5554caf78ee3ed0e4e00815a1be7e6c38
+  data.tar.gz: 75065bb9957f7e5d645e6a91c84f14ad401d84f51122a9071fd87b6914a1f9dc280b1d0112e8b150cb066a89455e4dbac0bb0953f7b8c19203d853bb3e14bfe4

data/lib/locales/en.yml

@@ -0,0 +1,3 @@
+---
+en:
+  accept_terms_and_conditions: I accept the <a href=\"%{terms_url}/en.html\" target=\"_new\">terms and conditions</a>

data/lib/locales/es.yml

@@ -0,0 +1,3 @@
+---
+es:
+  accept_terms_and_conditions: Acepto los <a href=\"%{terms_url}/es.html\" target=\"_new\">términos y condiciones</a>

data/lib/mumukit/login.rb

@@ -9,6 +9,8 @@ require 'mumukit/core'
 require 'mumukit/auth'
 require 'mumukit/platform'
 
+I18n.load_translations_path File.join(__dir__, '..', 'locales', '*.yml')
+
 module Mumukit::Login
   def self.configure
     @config ||= defaults
@@ -18,11 +20,14 @@ module Mumukit::Login
   def self.defaults
     struct.tap do |config|
       config.logo_url = ENV['MUMUKI_LOGO_URL'] || "https://mumuki.io/static/logo.png"
+      config.terms_url = ENV['MUMUKI_TERMS_URL'] || "https://mumuki.io/static/terms"
       config.mucookie_domain = ENV['MUMUKI_COOKIES_DOMAIN'] || ENV['MUMUKI_MUCOOKIE_DOMAIN']
       config.mucookie_secret_key = ENV['SECRET_KEY_BASE'] || ENV['MUMUKI_MUCOOKIE_SECRET_KEY']
       config.mucookie_secret_salt = ENV['MUMUKI_MUCOOKIE_SECRET_SALT'] || 'mucookie secret salt'
       config.mucookie_sign_salt = ENV['MUMUKI_MUCOOKIE_SIGN_KEY'] || 'mucookie sign salt'
 
+      config.mucookie_duration = ENV['MUMUKI_MUCOOKIE_DURATION'].defaulting(14, &:to_i)
+
       config.provider = Mumukit::Login::Provider.from_env
       config.saml = struct base_url: ENV['MUMUKI_SAML_BASE_URL'],
                            idp_sso_target_url: ENV['MUMUKI_SAML_IDP_SSO_TARGET_URL'],
@@ -95,4 +100,4 @@ end
 Mumukit::Auth.configure do |config|
   config.clients.mucookie = {id: ENV['MUMUKI_MUCOOKIE_CLIENT_ID'],
                              secret: ENV['MUMUKI_MUCOOKIE_SECRET']}
-end
+end

data/lib/mumukit/login/mucookie.rb

@@ -7,10 +7,9 @@ class Mumukit::Login::Mucookie
 
   def write!(key, value, options={})
     @controller.write_cookie! cookie_name(key),
-                              value: value.to_s,
-                              path: '/',
-                              domain: Mumukit::Login.config.mucookie_domain,
-                              httponly: !!options[:httponly]
+                              spec.merge(
+                                value: value.to_s,
+                                httponly: !!options[:httponly])
   end
 
   def encrypt_and_write!(key, value, options={})
@@ -37,6 +36,12 @@ class Mumukit::Login::Mucookie
     @controller.delete_cookie! cookie_name(key), Mumukit::Login.config.mucookie_domain
   end
 
+  def spec
+    { path: '/',
+      expires: Mumukit::Login.config.mucookie_duration.days.since,
+      domain: Mumukit::Login.config.mucookie_domain }
+  end
+
   private
 
   def cookie_name(key)

data/lib/mumukit/login/settings.rb

@@ -36,8 +36,10 @@ class Mumukit::Login::Settings
   def lock_json
     {
         languageDictionary: {
-            title: 'Mumuki'
+            title: 'Mumuki',
+            signUpTerms: I18n.t(:accept_terms_and_conditions, terms_url: Mumukit::Login.config.terms_url)
         },
+        mustAcceptTerms: true,
         language: I18n.locale,
         allowedConnections: lock_login_methods,
         socialButtonStyle: many_methods? ? 'small' : 'big',

data/lib/mumukit/login/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Login
-    VERSION = '4.1.0'
+    VERSION = '4.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-auth
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/locales/en.yml
+- lib/locales/es.yml
 - lib/mumukit/login.rb
 - lib/mumukit/login/controller.rb
 - lib/mumukit/login/form.rb