Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

db/Dockerfile

@@ -1,26 +1,18 @@
-FROM mariadb:10.7.5
+FROM mariadb:10.7.7
 
 ENV MYSQL_ROOT_PASSWORD root
 ENV TZ Europe/Madrid
 ARG MOCKDATE=2001-01-01 11:00:00
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends curl ca-certificates \
-    && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
-    && echo "deb http://apt.verdnatura.es/ jessie main" > /etc/apt/sources.list.d/vn.list \
-    && apt-get update \
-    && apt-get install -y vn-mariadb \
-    && apt-get purge -y --auto-remove curl ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
 COPY docker/docker.cnf /etc/mysql/conf.d/
 COPY \
+    docker/docker-start.sh \
     docker/docker-init.sh \
-    docker/docker-temp-start.sh \
     docker/docker-temp-stop.sh \
     docker/docker-dump.sh \
-    docker/docker-start.sh \
+    docker/docker-structure.sh \
+    docker/docker-fixtures.sh \
     /usr/local/bin/
 
 RUN mkdir /mysql-data \
@@ -31,26 +23,16 @@ WORKDIR /docker-boot
 COPY \
     import-changes.sh \
     config.ini \
-    dump/mysqlPlugins.sql \
     dump/structure.sql \
     dump/mockDate.sql \
     dump/dumpedFixtures.sql \
     ./
-RUN gosu mysql docker-init.sh \
+RUN sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
-    && docker-dump.sh mysqlPlugins \
+    && gosu mysql docker-structure.sh
-    && docker-dump.sh structure \
-    && sed -i -e 's/@mockDate/'"$MOCKDATE"'/g' mockDate.sql \
-    && docker-dump.sh mockDate \
-    && docker-dump.sh dumpedFixtures \
-    && gosu mysql docker-temp-stop.sh
-
 COPY changes ./changes
 COPY dump/fixtures.sql ./
 ARG STAMP=unknown
-RUN gosu mysql docker-temp-start.sh \
+RUN gosu mysql docker-fixtures.sh
-    && ./import-changes.sh \
-    && docker-dump.sh fixtures \
-    && gosu mysql docker-temp-stop.sh
 
 RUN echo "[INFO] -> Import finished" \
     && rm -rf /docker-boot

db/docker/docker-fixtures.sh

@@ -5,3 +5,6 @@ CMD=mysqld
 
 docker_setup_env "$CMD"
 docker_temp_server_start "$CMD"
+bash import-changes.sh
+docker-dump.sh fixtures
+docker_temp_server_stop

db/docker/docker-structure.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. docker-init.sh
+docker-dump.sh structure
+docker-dump.sh mockDate
+docker-dump.sh dumpedFixtures
+. docker-temp-stop.sh

db/dump/mysqlPlugins.sql

@@ -1,4 +0,0 @@
-
--- Import compiled functions
-CREATE AGGREGATE FUNCTION minacum RETURNS INT SONAME 'minacum.so';
-CREATE AGGREGATE FUNCTION multimax RETURNS INT SONAME 'multimax.so';

modules/account/back/methods/account/change-password.js

@@ -1,6 +1,6 @@
 
 module.exports = Self => {
-    Self.remoteMethodCtx('changePassword', {
+    Self.remoteMethod('changePassword', {
         description: 'Changes the user password',
         accessType: 'WRITE',
         accepts: [

modules/account/back/methods/account/specs/set-password.spec.js

@@ -1,14 +1,15 @@
 const {models} = require('vn-loopback/server/server');
 
 describe('Account setPassword()', () => {
+    const ctx = {req: {accessToken: {userId: 9}}};
     it('should throw an error when password does not meet requirements', async() => {
-        let req = models.Account.setPassword(1, 'insecurePass');
+        let req = models.Account.setPassword(ctx, 1, 'insecurePass');
 
         await expectAsync(req).toBeRejected();
     });
 
     it('should update password when it passes requirements', async() => {
-        let req = models.Account.setPassword(1, 'Very$ecurePa22.');
+        let req = models.Account.setPassword(ctx, 1, 'Very$ecurePa22.');
 
         await expectAsync(req).toBeResolved();
     });

modules/client/back/methods/client/specs/setPassword.spec.js

@@ -1,11 +1,12 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('Client setPassword', () => {
+    const ctx = {req: {accessToken: {userId: 9}}};
     it('should throw an error the setPassword target is not just a client but a worker', async() => {
         let error;
 
         try {
-            await models.Client.setPassword(1, 't0pl3v3l.p455w0rd!');
+            await models.Client.setPassword(ctx, 1, 't0pl3v3l.p455w0rd!');
         } catch (e) {
             error = e;
         }
@@ -17,7 +18,7 @@ describe('Client setPassword', () => {
         let error;
 
         try {
-            await models.Client.setPassword(1101, 't0pl3v3l.p455w0rd!');
+            await models.Client.setPassword(ctx, 1101, 't0pl3v3l.p455w0rd!');
         } catch (e) {
             error = e;
         }