Merge branch 'server' into web

@@ -27,6 +27,7 @@ exports.register = async(ctx) => {
         userNm : Joi.string().required(),
         userNm : Joi.string().required(),
         birth : Joi.string().required(),
         birth : Joi.string().required(),
         contact : Joi.string().required(),
         contact : Joi.string().required(),
+        deviceToken : Joi.string(),
     });
     });
     
     
     const result = schema.validate(ctx.request.body);
     const result = schema.validate(ctx.request.body);
@@ -200,8 +201,9 @@ exports.login = async(ctx) => {
 
 
     const schema = Joi.object().keys({
     const schema = Joi.object().keys({
         userId : Joi.string().email().max(50).required(),
         userId : Joi.string().email().max(50).required(),
-        password : Joi.string().required()
-    })
+        password : Joi.string().required(),
+        deviceToken : Joi.string(),
+    });
 
 
     const result = schema.validate(ctx.request.body);
     const result = schema.validate(ctx.request.body);
     if(result.error) {
     if(result.error) {
@@ -333,7 +335,7 @@ exports.socialRegister = async ctx => {
 
 
     const user = new User({
     const user = new User({
         userId,
         userId,
-        hashedPassword : null,
+        hashedPassword : 'unnecessary',
         authTypeCd : socialType.toUpperCase(),
         authTypeCd : socialType.toUpperCase(),
         useYn : 'Y',
         useYn : 'Y',
     });
     });