Merge remote-tracking branch 'origin/main'

# Conflicts:
#	backend/test/user.test.js

backend/app.js

@@ -15,7 +15,7 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
 // database
-const db = require("./models/index");
+const db = require("./models");
 const Role = db.Role;
 const User = db.User;
 const PitchType = db.PitchType;

backend/models/user.model.js

@@ -52,6 +52,15 @@ module.exports = (sequelize, DataTypes) => {
         user.password = await bcrypt.hash(user.password, salt);
       }
     }
+  }, {
+    defaultScope: {
+      attributes: { exclude: ['password'] },
+    },
+    scopes: {
+      withSecretColumns: {
+        attributes: { include: ['password'] },
+      },
+    },
   });
 
   User.prototype.validPassword = function (password) {