lesli_shield 1.1.3 → 1.1.4

data/app/assets/stylesheets/lesli_shield/users.css

@@ -1 +1,31 @@
+@charset "UTF-8";
+/*
+Lesli
 
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+*/

data/app/controllers/users/sessions_controller.rb

@@ -126,7 +126,7 @@ class Users::SessionsController < Devise::SessionsController
             # Ensures it's a local path
             return redirect_path if uri.relative?  
         end
-        Lesli.config.path_after_login || root_path
+        Lesli.config.shield.dig(:path_after_login) || root_path
     rescue URI::InvalidURIError
         # If the URL is invalid, fallback to root
         root_path  

data/app/services/lesli_shield/user_registration_service.rb

@@ -59,36 +59,31 @@ module LesliShield
             # check if instance is for multi-account
             allow_multiaccount = Lesli.config.security.dig(:allow_multiaccount)
 
-            # create new account for the new user only if multi-account is allowed
             if allow_multiaccount === true
+                # create new account for the new user only if multi-account is allowed
                 account = Lesli::Account.create!({
                     user: resource,     # set user as owner of his just created account
                     name: "Lesli",      # temporary company name
                     email: resource.email,
                     status: :active     # account is active due user already confirmed his email
                 })
-            end
-
-            # if multi-account is not allowed user belongs to the first account in instance
-            if allow_multiaccount === false
+            else
+                # if multi-account is not allowed user belongs to the first account in instance
                 account = Lesli::Account.first
             end
 
             # add user to his own account
             resource.account = account
-
-            # add owner role to user only if multi-account is allowed
+            
             if allow_multiaccount == true
+                # add owner role to user only if multi-account is allowed
                 resource.user_roles.create({ role: account.roles.find_by(name: "owner") })
-            end
-
-            # add profile role to user only if multi-account is allowed
-            if allow_multiaccount == false
+            else
                 # Assigning default role if defined in account settings
                 # Otherwise, the default role is "limited"
                 #default_role_id = account.settings.find_by(:name => "default_role_id")&.value
-                default_role_id = nil
-                    
+                default_role_id = Lesli.config.shield.dig(:default_role)
+
                 if default_role_id.present?
                     resource.roles.create({ role: account.roles.find_by(:id => default_role_id)})
                 else

data/app/views/devise/registrations/new.html.erb

@@ -38,7 +38,12 @@ if Lesli.config.demo
 end
 %>
 
-<%= render("devise/shared/application-devise", title:"Create an account to discover Lesli") do %>
+<%
+title = I18n.t("overrides.lesli_shield.devise/registrations.view_title",
+        default: :"lesli_shield.devise/registrations.view_title")
+%>
+
+<%= render("devise/shared/application-devise", title:title) do %>
 
     <%= form_for(
         resource, 
@@ -63,17 +68,11 @@ end
         ) %>
 
         <div class="field mb-5">
-            <p>Password needs to contain:</p>
+            <p><%= I18n.t("lesli_shield.devise/registrations.view_password_requirements") %></p>
             <ul class="pl-3 password-requirements">
-                <li>
-                    &bull; Minimum  one uppercase letter
-                </li>
-                <li>
-                    &bull; One symbol
-                </li>
-                <li>
-                    &bull; One number
-                </li>
+                <li>&bull; <%= I18n.t("lesli_shield.devise/registrations.view_password_requirements_uppercase") %></li>
+                <li>&bull; <%= I18n.t("lesli_shield.dashboards.view_password_requirements_symbol") %></li>
+                <li>&bull; <%= I18n.t("lesli_shield.dashboards.view_password_requirements_number") %></li>
             </ul>
         </div>
 
@@ -89,15 +88,16 @@ end
                 <button 
                     type="submit" 
                     class="button is-primary is-fullwidth mb-2">
-                    Create account
+                    <%= I18n.t("overrides.lesli_shield.devise/registrations.button_create_account",
+                                default: :"lesli_shield.devise/registrations.button_create_account") %>
                 </button>
             </div>
         </div>
 
         <p class="account has-text-centered">
-            Already have an account? 
+            <%= I18n.t("lesli_shield.devise/registrations.view_already_have_an_account") %>
             <%= link_to(new_user_session_path, :class => "has-text-primary") do %>
-                <u><b>Log in</b></u>
+                <u><b><%= I18n.t("lesli_shield.devise/registrations.button_login") %></b></u>
             <% end %>
         </p> 
     <% end %>

data/app/views/devise/sessions/new.html.erb

@@ -39,7 +39,12 @@ if Lesli.config.demo
 end
 %>
 
-<%= render("devise/shared/application-devise", title:"Welcome to Lesli") do %>
+<%
+title = I18n.t("overrides.lesli_shield.devise/sessions.view_title",
+        default: :"lesli_shield.devise/sessions.view_title")
+%>
+
+<%= render("devise/shared/application-devise", title:title) do %>
 
     <%= form_for(
         resource, 
@@ -77,16 +82,16 @@ end
                 <button 
                     type="submit" 
                     class="button is-primary is-fullwidth mb-2">
-                    Log in
+                    <%= I18n.t("lesli_shield.devise/sessions.button_log_in") %>
                 </button>
             </div>
         </div>
 
         <% if Lesli.config.security.dig(:allow_registration) %>
             <p class="account has-text-centered">
-                Still not registered? 
+                <%= I18n.t("lesli_shield.devise/sessions.view_still_not_registered") %>
                 <%= link_to(new_user_registration_path, :class => "has-text-primary") do %>
-                    <u><b>Create account</b></u>
+                    <u><b><%= I18n.t("lesli_shield.devise/sessions.button_create_account") %></b></u>
                 <% end %>
             </p> 
         <% end %>

data/app/views/devise/shared/_application-devise.html.erb

@@ -59,7 +59,6 @@ Building a better future, one line of code at a time.
                             :alt => "Main logo") 
                         %>
                         <h1 class="is-title is-size-3 has-text-primary">
-                            <%#= I18n.t("core.users/sessions.view_text_welcome") %>
                             <%= title %>
                         </h1>
                     </div>

data/config/locales/translations.en.yml

@@ -3,3 +3,17 @@
   lesli_shield:
     devise/sessions:
       message_not_valid_credentials: Not valid credentials
+      view_title: Welcome to Lesli
+      button_log_in: Log in
+      view_still_not_registered: Still not registered?
+      button_create_account: Create account
+    devise/registrations:
+      view_title: Create an account to discover Lesli
+      view_password_requirements: 'Password needs to contain:'
+      view_password_requirements_uppercase: 'Minimum one uppercase letter '
+      button_create_account: Create account
+      view_already_have_an_account: Already have an account?
+      button_login: Log in
+    dashboards:
+      view_password_requirements_symbol: One symbol
+      view_password_requirements_number: One number

data/config/locales/translations.es.yml

@@ -3,3 +3,17 @@
   lesli_shield:
     devise/sessions:
       message_not_valid_credentials: Credenciales no validas
+      view_title: ":lesli_shield.devise/sessions.view_title:"
+      button_log_in: Iniciar sesión
+      view_still_not_registered: "¿Aún no tienes cuenta?"
+      button_create_account: Crear cuenta
+    devise/registrations:
+      view_title: Crea una cuenta y descubre Lesli
+      view_password_requirements: 'La contraseña debe incluir:'
+      view_password_requirements_uppercase: Una letra mayuscula
+      button_create_account: Crear cuenta
+      view_already_have_an_account: "¿Ya tienes cuenta?"
+      button_login: Iniciar sesión
+    dashboards:
+      view_password_requirements_symbol: Un caracter especial
+      view_password_requirements_number: Un número

data/lib/lesli_shield/version.rb

@@ -1,4 +1,4 @@
 module LesliShield
-  VERSION = "1.1.3"
-  BUILD = "1777771350"
+  VERSION = "1.1.4"
+  BUILD = "1780272810"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lesli_shield
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - The Lesli Development Team
@@ -163,9 +163,6 @@ files:
 - config/initializers/devise.rb
 - config/locales/translations.en.yml
 - config/locales/translations.es.yml
-- config/locales/translations.fr.yml
-- config/locales/translations.it.yml
-- config/locales/translations.pt.yml
 - config/routes.rb
 - db/migrate/v1/0801000110_create_lesli_shield_accounts.rb
 - db/migrate/v1/0801100210_create_lesli_shield_role_actions.rb

data/config/locales/translations.fr.yml

@@ -1,2 +0,0 @@
----
-:fr: {}

data/config/locales/translations.it.yml

@@ -1,5 +0,0 @@
----
-:it:
-  lesli_shield:
-    devise/sessions:
-      message_not_valid_credentials: ":lesli_shield.devise/sessions.message_not_valid_credentials:"

data/config/locales/translations.pt.yml

@@ -1,2 +0,0 @@
----
-:pt: {}