Merge branch 'server' into web

@@ -318,12 +318,19 @@ exports.socialRegister = async ctx => {
             const result = await axios.get(url, {
             const result = await axios.get(url, {
                 headers : {
                 headers : {
                     Authorization : `Bearer ${accessToken}`,
                     Authorization : `Bearer ${accessToken}`,
+                    'Content-type' : 'application/x-www-form-urlencoded;charset=utf-8',
                 },
                 },
             });
             });
 
 
-            console.log(result);
+            const { email, profile } = result.data.kakao_account;
+
+            return {
+                userId : email,
+                userNm : profile.nickname,
+                contact : `${email}_등록되지않은 번호`,
+                birth : '등록되지않음',
+            };
 
 
-            return result;
         } : () => null;
         } : () => null;
     
     
     
     
@@ -410,12 +417,11 @@ exports.socialLogin = async ctx => {
             const result = await axios.get(url, {
             const result = await axios.get(url, {
                 headers : {
                 headers : {
                     Authorization : `Bearer ${accessToken}`,
                     Authorization : `Bearer ${accessToken}`,
+                    'Content-type' : 'application/x-www-form-urlencoded;charset=utf-8',
                 },
                 },
             });
             });
 
 
-            console.log(result);
-
-            return result;
+            return result.data.kakao_account.email;
         } : () => null;
         } : () => null;