@igea/oac_frontend 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_frontend",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Frontend service for the OAC project",
   "main": "src/index.js",
   "scripts": {

package/src/config/development.json

@@ -2,7 +2,7 @@
 	"protocol": "http",
 	"url_register": "http://localhost:4001/register",
 	"port_range": {
-		"min": 5000, "max": 6000
+		"min": 4200, "max": 4299
 	},
 	"jwt_secret": "@igea#"
 }

package/src/config/production.json

@@ -2,7 +2,7 @@
 	"protocol": "http",
 	"url_register": "http://localhost:4001/register",
 	"port_range": {
-		"min": 5000, "max": 6000
+		"min": 4200, "max": 4299
 	},
 	"jwt_secret": "@igea#"
 }

package/src/controllers/users.js

@@ -40,6 +40,18 @@ module.exports = function(serviceName) {
 
     });
 
+    router.get('/reset_password/:id/:token', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'Reset password',
+            user: {
+                id: req.params.id,
+                token: req.params.token
+            }
+        });    
+        res.render('users/reset_password.twig', data.toJson()); 
+    });
+
     return router
 }
 

package/src/index.js

@@ -12,6 +12,8 @@ const jwtLib = jwtLibFactory({
     secret: process.env.JWT_SECRET || config.jwt_secret,
     excludePaths: [
         `/${serviceName}/`,
+        `/${serviceName}/password_recovery`,
+        new RegExp(`^/${serviceName}/users/reset_password/[^/]+/[^/]+$`),
         `/${serviceName}/health`,
         `/${serviceName}/captcha/random-image`
     ],
@@ -90,6 +92,9 @@ getPort.default({
     app.get(`/${serviceName}`, (req, res) => {
         res.render('login', { root: serviceName, title: 'Login' });
     });
+    app.get(`/${serviceName}/password_recovery`, (req, res) => {
+        res.render('password_recovery', { root: serviceName, title: 'Password recovery' });
+    });
     app.get(`/${serviceName}/home`, (req, res) => {
         let data = new DataModel(req, {  
             root: serviceName, 

package/src/locales/en.json

@@ -4,9 +4,21 @@
         "title": "Login",
         "user": "Email or Username",
         "password": "Password",
+        "password_recovery": "Forgot your password?",
+        "invalid_user": "Invalid username or password",
         "sign_in": "Sign in",
         "anonymous": "Anonymous"
     },
+    "password_recovery": {
+        "title": "Password recovery",
+        "instructions": "Enter your email address or username to receive password recovery instructions.",
+        "email": "Email",
+        "send_instructions": "Send instructions",
+        "back_to_login": "Back to login",
+        "invalid_email": "Invalid email address",
+        "email_sent": "Instructions have been sent to your email address, if it exists in our system."
+        "password_reset_success": "Your password has been reset successfully. You can now log in with your new password."        
+    },
     "users": {
         "manage": {
             "title": "Users",

package/src/locales/it.json

@@ -4,9 +4,21 @@
         "title": "Accesso",
         "user": "Email o Nome utente",
         "password": "Password",
+        "password_recovery": "Hai dimenticato la password?",
+        "invalid_user": "Nome utente o password non validi",
         "sign_in": "Accedi",
         "anonymous": "Anonimo"
     },
+    "password_recovery": {
+        "title": "Recupero password",
+        "instructions": "Inserisci il tuo indirizzo email o nome utente per ricevere le istruzioni di recupero della password.",
+        "email": "Email",
+        "send_instructions": "Invia istruzioni",
+        "back_to_login": "Torna al login",
+        "invalid_email": "Indirizzo email non valido",
+        "email_sent": "Le istruzioni sono state inviate al tuo indirizzo email, se esiste nel nostro sistema.",
+        "password_reset_success": "La tua password è stata reimpostata con successo. Ora puoi accedere con la tua nuova password."
+    },
     "users": {
         "manage": {
             "title": "Utenti",

package/src/public/js/login/login.js

@@ -1,6 +1,6 @@
 onSubmit = function(type){
-
-    axios.post("/backend/auth/authenticate", {
+    var url = "/backend/auth/authenticate";
+    axios.post(url, {
         type: type,
         user: (type == "login") ? 
             document.getElementById("username").value : "",
@@ -11,5 +11,4 @@ onSubmit = function(type){
     }).catch(error => {
         console.log(error);
     });
-
 }

package/src/public/js/login/password_recovery.js

@@ -0,0 +1,32 @@
+function passwordrecoveryInit(options={}){
+
+    window.onSubmit = function(){
+        var url = "/backend/auth/password_recovery";
+        axios.post(url, {
+            user: document.getElementById("username").value
+        }).then(response => {
+            alert(options.labels.email_sent);
+            window.location = "/frontend/";
+        }).catch(error => {
+            console.log(error);
+        });
+    }
+
+    window.onSubmitReset = function(){
+
+        alert(options.labels.reset_success);
+        window.location = "/frontend/";
+        /*
+        var url = "/backend/auth/password_recovery";
+        axios.post(url, {
+            user: document.getElementById("username").value
+        }).then(response => {
+            alert(options.labels.email_sent);
+            window.location = "/frontend/";
+        }).catch(error => {
+            console.log(error);
+        });
+        */
+    }
+
+}

package/src/views/login.twig

@@ -14,12 +14,16 @@
         <div>
             <label for="username">{{ t('login.user') }}</label>
             {% if invalidLogin %}
-                <span class=".login-message">Invalid credentials</span>
+                <span class=".login-message">{{ t('login.invalid_user') }}</span>
             {% endif %}
             <input type="text" id="username" name="username" required />
             <label for="password">{{ t('login.password') }}</label>
             <input type="password" id="password" name="password" required />
             <button onclick="onSubmit('login')">{{ t('login.sign_in') }}</button>
+            <a href="/{{ root }}/password_recovery">
+                <i class="fa-solid fa-key"></i>
+                <span>{{ t('login.password_recovery') }}</span>
+            </a>
             <button onclick="onSubmit('anonymous');" style="background: #ff0000">
                 {{ t('login.anonymous') }}</button>
         </div>

package/src/views/password_recovery.twig

@@ -0,0 +1,28 @@
+{% set showSidebar = false %}
+
+{% extends "base.twig" %}
+
+{% block extendHead %}
+    <link rel="stylesheet" href="/{{ root }}/css/login.css">
+    <script src="/{{ root }}/js/login/password_recovery.js"></script>
+{% endblock %}
+
+{% block content %}
+    
+    <div class="login-container">
+        <h2><i class="fa-solid fa-key"></i> {{ t('password_recovery.title') }}</h2>
+        <h6>{{ t('password_recovery.instructions') }}</h6>
+        <div>
+            <input type="text" id="username" name="username" required />
+            <button onclick="onSubmit()">{{ t('password_recovery.send_instructions') }}</button>
+        </div>
+    </div>
+    <script>
+        passwordrecoveryInit({
+            labels: {
+                email_sent: "{{ t('password_recovery.email_sent') }}"
+            }
+        });
+    </script>
+    
+{% endblock %}

package/src/views/users/reset_password.twig

@@ -0,0 +1,36 @@
+{% set showSidebar = false %}
+
+{% extends "../base.twig" %}
+
+{% block extendHead %}
+    <link rel="stylesheet" href="/{{ root }}/css/login.css">
+    <script src="/{{ root }}/js/login/password_recovery.js"></script>
+{% endblock %}
+
+{% block content %}
+    
+    <div class="login-container">
+        <h2><i class="fa-solid fa-key"></i> {{ t('password_recovery.title') }}</h2>
+        <div>
+                        
+            <label for="password">{{ t('users.edit.password') }}</label>
+            <input type="password" id="password" name="password" required />
+            
+            <label for="re_password">{{ t('users.edit.confirm_password') }}</label>
+            <input type="password" id="re_password" name="re_password" required />
+
+            <button onclick="onSubmitReset()">{{ t('users.edit.save') }}</button>
+            
+        </div>
+    </div>
+    <script>
+        passwordrecoveryInit({
+            user: {{ user.id}},
+            token: "{{ user.token}}",
+            labels: {
+                reset_success: "{{ t('password_recovery.password_reset_success') }}"
+            }
+        });
+    </script>
+    
+{% endblock %}