ncloudchat 0.0.24-beta → 0.0.27-beta

package/lib/mutations/friend.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.deleteFriend = exports.updateFriend = exports.rejectFriend = exports.acceptFriend = exports.createFriend = void 0;
+exports.removeFriend = exports.rejectFriend = exports.acceptFriend = exports.requestFriend = void 0;
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 
@@ -163,7 +163,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var createFriend = function createFriend(channelId, friendIds) {
+var requestFriend = function requestFriend(friendId) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -172,7 +172,7 @@ var createFriend = function createFriend(channelId, friendIds) {
           token = _CoreManager["default"].get("TOKEN");
           projectId = _CoreManager["default"].get("PROJECT_ID");
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n    mutation (\n        $projectId: String!, \n        $channelId: String!,\n        $friendIds: String!\n    ) {\n        requestFriend(\n            input: {\n                projectId: $projectId, \n                channelId: $channelId,\n                friendIds: $friendIds\n            }\n        ) {\n            friendship {\n                id\n            }\n        }\n    }\n    ";
+          query = "\n    mutation ($projectId: String!, $friendId: String!) {\n        requestFriend(input: {projectId: $projectId, friendId: $friendId}) {\n            friendship {\n                project_id\n                id\n                status\n                user {\n                    id\n                    nickname\n                    profile\n                }\n                friend {\n                    id\n                    nickname\n                    profile\n                }\n                friend_id\n                created_at\n                updated_at\n                requested_at\n            }\n        }\n    }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -186,14 +186,17 @@ var createFriend = function createFriend(channelId, friendIds) {
               query: query,
               variables: {
                 projectId: projectId,
-                channelId: channelId,
-                friendIds: friendIds
+                friendId: friendId
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            return data.data.createFriend.friendship;
+            if (data.errors) {
+              throw data.errors[0];
+            }
+
+            return data.data.requestFriend.friendship;
           })];
 
         case 1:
@@ -205,7 +208,7 @@ var createFriend = function createFriend(channelId, friendIds) {
   });
 };
 
-exports.createFriend = createFriend;
+exports.requestFriend = requestFriend;
 
 var acceptFriend = function acceptFriend(friendId) {
   return __awaiter(void 0, void 0, void 0, function () {
@@ -216,7 +219,7 @@ var acceptFriend = function acceptFriend(friendId) {
           token = _CoreManager["default"].get("TOKEN");
           projectId = _CoreManager["default"].get("PROJECT_ID");
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n    mutation (\n        $projectId: String!, \n        $friendId: String!\n    ) {\n        requestFriend(\n            input: {\n                projectId: $projectId, \n                friendId: $friendId\n            }\n        ) {\n            friendship {\n                id\n            }\n        }\n    }\n    ";
+          query = "\n    mutation ($projectId: String!, $friendId: String!) {\n        acceptFriend(input: {projectId: $projectId, friendId: $friendId}) {\n            friendship {\n                project_id\n                id\n                status\n                user {\n                    id\n                    nickname\n                    profile\n                }\n                friend {\n                    id\n                    nickname\n                    profile\n                }\n                friend_id\n                created_at\n                updated_at\n                requested_at\n            }\n        }\n    }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -236,7 +239,11 @@ var acceptFriend = function acceptFriend(friendId) {
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            return data.data.createFriend.friendship;
+            if (data.errors) {
+              throw data.errors[0];
+            }
+
+            return data.data.acceptFriend.friendship;
           })];
 
         case 1:
@@ -250,7 +257,7 @@ var acceptFriend = function acceptFriend(friendId) {
 
 exports.acceptFriend = acceptFriend;
 
-var rejectFriend = function rejectFriend(channelId, friendIds) {
+var rejectFriend = function rejectFriend(friendId) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -259,7 +266,7 @@ var rejectFriend = function rejectFriend(channelId, friendIds) {
           token = _CoreManager["default"].get("TOKEN");
           projectId = _CoreManager["default"].get("PROJECT_ID");
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n    mutation (\n        $projectId: String!, \n        $channelId: String!,\n        $friendIds: String!\n    ) {\n        requestFriend(\n            input: {\n                projectId: $projectId, \n                channelId: $channelId,\n                friendIds: $friendIds\n            }\n        ) {\n            friendship {\n                id\n            }\n        }\n    }\n    ";
+          query = "\n    mutation ($projectId: String!, $friendId: String!) {\n        rejectFriend(input: {projectId: $projectId, friendId: $friendId}) {\n            friendship {\n                project_id\n                id\n                status\n                user {\n                    id\n                    nickname\n                    profile\n                }\n                friend {\n                    id\n                    nickname\n                    profile\n                }\n                friend_id\n                created_at\n                updated_at\n                requested_at\n            }\n        }\n    }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -273,14 +280,17 @@ var rejectFriend = function rejectFriend(channelId, friendIds) {
               query: query,
               variables: {
                 projectId: projectId,
-                channelId: channelId,
-                friendIds: friendIds
+                friendId: friendId
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            return data.data.createFriend.friendship;
+            if (data.errors) {
+              throw data.errors[0];
+            }
+
+            return data.data.rejectFriend.friendship;
           })];
 
         case 1:
@@ -294,26 +304,49 @@ var rejectFriend = function rejectFriend(channelId, friendIds) {
 
 exports.rejectFriend = rejectFriend;
 
-var updateFriend = function updateFriend() {
+var removeFriend = function removeFriend(friendId) {
   return __awaiter(void 0, void 0, void 0, function () {
+    var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
-      return [2
-      /*return*/
-      ];
-    });
-  });
-};
+      switch (_a.label) {
+        case 0:
+          token = _CoreManager["default"].get("TOKEN");
+          projectId = _CoreManager["default"].get("PROJECT_ID");
+          endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
+          query = "\n    mutation ($projectId: String!, $friendId: String!) {\n        removeFriend(input: {projectId: $projectId, friendId: $friendId}) {\n            friendship {\n                project_id\n                id\n                status\n                user {\n                    id\n                    nickname\n                    profile\n                }\n                friend {\n                    id\n                    nickname\n                    profile\n                }\n                friend_id\n                created_at\n                updated_at\n                requested_at\n            }\n        }\n    }\n    ";
+          return [4
+          /*yield*/
+          , fetch(endpoint, {
+            method: 'POST',
+            headers: {
+              'Authorization': 'Bearer ' + token,
+              'Content-Type': 'application/json',
+              'Accept': 'application/json'
+            },
+            body: (0, _stringify["default"])({
+              query: query,
+              variables: {
+                projectId: projectId,
+                friendId: friendId
+              }
+            })
+          }).then(function (res) {
+            return res.json();
+          }).then(function (data) {
+            if (data.errors) {
+              throw data.errors[0];
+            }
 
-exports.updateFriend = updateFriend;
+            return data.data.removeFriend.friendship;
+          })];
 
-var deleteFriend = function deleteFriend() {
-  return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-      return [2
-      /*return*/
-      ];
+        case 1:
+          return [2
+          /*return*/
+          , _a.sent()];
+      }
     });
   });
 };
 
-exports.deleteFriend = deleteFriend;
+exports.removeFriend = removeFriend;

package/lib/mutations/user.js

@@ -163,7 +163,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var login = function login(user_id, name, profile) {
+var login = function login(user_id, name, profile, token) {
   if (name === void 0) {
     name = '';
   }
@@ -172,11 +172,17 @@ var login = function login(user_id, name, profile) {
     profile = '';
   }
 
+  if (token === void 0) {
+    token = '';
+  }
+
   return __awaiter(void 0, void 0, void 0, function () {
     var projectId, endpoint, mutation;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
+          _CoreManager["default"].set("TOKEN", token);
+
           projectId = _CoreManager["default"].get("PROJECT_ID");
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
           mutation = "mutation login ($projectId: String!, $userId: String!, $name: String, $profile: String) {\n        login(input :{ projectId: $projectId, userId:$userId, name:$name, profile:$profile}) {\n            token\n        }\n    }";
@@ -185,6 +191,7 @@ var login = function login(user_id, name, profile) {
           , fetch(endpoint, {
             method: 'POST',
             headers: {
+              'Authorization': 'Bearer ' + token,
               'Content-Type': 'application/json',
               'Accept': 'application/json'
             },
@@ -194,15 +201,16 @@ var login = function login(user_id, name, profile) {
                 projectId: projectId,
                 userId: user_id,
                 name: name,
-                profile: profile
+                profile: profile,
+                token: token
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            if (data.errors) {
-              throw data.errors[0];
-            } else if (data.data.login.token) return data.data.login.token;else return false;
+            if (data.errors) throw data.errors[0];else if (data.message) throw data;else if (data.data.login.token) {
+              return data.data.login.token;
+            } else return false;
           })];
 
         case 1:

package/lib/queries/friend.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.getFriends = void 0;
+exports.getFriendships = void 0;
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 
@@ -163,7 +163,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var getFriends = function getFriends(offset, per_page, search, query) {
+var getFriendships = function getFriendships(filter, sort, option) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, lquery;
     return __generator(this, function (_a) {
@@ -178,7 +178,7 @@ var getFriends = function getFriends(offset, per_page, search, query) {
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          lquery = "\n        query friends ($projectId: String!, $offset: Int!, $per_page: Int!, $search:String, $query:String) {\n            friends(projectId: $projectId, offset:$offset, per_page:$per_page, search:$search, query:$query) {\n                totalCount\n                edges {\n                    node {\n                        project_id\n                        id\n                        created_at\n                        updated_at\n                    }\n                }\n            }\n        }\n    ";
+          lquery = "\n          query friendships ($projectId: String!, $filter: String!, $sort: String, $option: String) {\n            friendships(projectId: $projectId, filter:$filter, sort:$sort, option: $option) {\n                totalCount\n                edges {\n                  node {\n                    project_id\n                    id\n                    status\n                    user {\n                      id\n                      nickname\n                      profile\n                    }\n                    friend {\n                        id\n                        nickname\n                        profile\n                    }\n                    user_id\n                    friend_id\n                    created_at\n                    updated_at\n                    requested_at\n                  }\n                }\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -192,17 +192,16 @@ var getFriends = function getFriends(offset, per_page, search, query) {
               query: lquery,
               variables: {
                 projectId: projectId,
-                offset: offset,
-                per_page: per_page,
-                search: search === "" ? undefined : search,
-                query: query === "" ? undefined : query
+                filter: filter,
+                sort: sort,
+                option: option
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            if (data.data.channels) {
-              return data.data.channels.edges;
+            if (data.data.friendships) {
+              return data.data.friendships.edges;
             }
 
             return [];
@@ -217,4 +216,4 @@ var getFriends = function getFriends(offset, per_page, search, query) {
   });
 };
 
-exports.getFriends = getFriends;
+exports.getFriendships = getFriendships;

package/ncloudchat_javascript.md

@@ -26,12 +26,11 @@ chat.initialize(projectId);
 - 초기화가 완료되면 사용자명, 이름, 프로필 이미지주소(옵션) 을 입력 후에 접속해야 합니다. 
 
 ```javascript
-chat.setUser({
+const user = await chat.connect({
     id: USERNAME,
     name: NAME,
     profile: PROFILE_URL
-});
-const user = await chat.connect(user_id);
+}, TOKEN);
 ```
 
 | ID         | type   | desc        |
@@ -39,7 +38,7 @@ const user = await chat.connect(user_id);
 | USERNAME | string |  아이디 |
 | NAME | string | 이름 |
 | PROFILE_URL | string | 프로필 주소 |
-
+| TOKEN | string | 토큰 값 |
 
 
 ### 3. Disconnect from NCloud Chat Server

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ncloudchat",
   "jsName": "ncloudchat",
-  "version": "0.0.24-beta",
+  "version": "0.0.27-beta",
   "private": false,
   "description": "",
   "keywords": [
@@ -22,7 +22,8 @@
     "start": "npm run lint && webpack-dev-server --open --config webpack.dev.js",
     "lint": "tsc --noEmit && eslint --ext .ts",
     "server": "node test/server.js",
-    "publish-dev": "aws --endpoint-url=https://kr.object.ncloudstorage.com s3 cp dist/ncloudchat.min.js s3://ncloudchat/dev/ --acl public-read"
+    "publish-dev": "aws --endpoint-url=https://kr.object.ncloudstorage.com s3 cp dist/ncloudchat.min.js s3://ncloudchat/dev/ --acl public-read",
+    "publish": "aws --endpoint-url=https://kr.object.ncloudstorage.com s3 cp dist/ncloudchat.min.js s3://ncloudchat/ --acl public-read"
   },
   "repository": {
     "type": "git"