@vtecx/vtecxnext 1.1.8 → 1.1.10

package/dist/vtecxnext.d.ts

@@ -199,6 +199,15 @@ export declare const deleteEntry: (req: IncomingMessage | undefined, res: Server
  * @return true if successful
  */
 export declare const deleteFolder: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, async?: boolean, targetService?: string) => Promise<boolean>;
+/**
+ * clear folder
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri parent key
+ * @param async execute async
+ * @return true if successful
+ */
+export declare const clearFolder: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, async?: boolean, targetService?: string) => Promise<boolean>;
 /**
  * allocate numbers
  * @param req request (for authentication)
@@ -506,6 +515,14 @@ export declare const pushNotification: (req: IncomingMessage, res: ServerRespons
  * @param channel channel
  */
 export declare const setMessageQueueStatus: (req: IncomingMessage, res: ServerResponse, flag: boolean, channel: string) => Promise<boolean>;
+/**
+ * get status of MessageQueue.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param name name
+ * @return feed
+ */
+export declare const getMessageQueueStatus: (req: IncomingMessage, res: ServerResponse, channel: string) => Promise<any>;
 /**
  * set MessageQueue.
  * @param req request (for authentication)
@@ -516,7 +533,7 @@ export declare const setMessageQueueStatus: (req: IncomingMessage, res: ServerRe
  */
 export declare const setMessageQueue: (req: IncomingMessage, res: ServerResponse, feed: any, channel: string) => Promise<boolean>;
 /**
- * get feed from session
+ * get messageQueue.
  * @param req request (for authentication)
  * @param res response (for authentication)
  * @param name name
@@ -816,6 +833,14 @@ export declare const deleteTotp: (req: IncomingMessage, res: ServerResponse, acc
  * @return message
  */
 export declare const changeTdid: (req: IncomingMessage, res: ServerResponse) => Promise<any>;
+/**
+ * Merge an existing user with an line oauth user.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param rxid RXID
+ * @return message feed
+ */
+export declare const mergeOAuthUserLine: (req: IncomingMessage, res: ServerResponse, rxid: string) => Promise<any>;
 /**
  * null、undefined、空文字の判定
  * @param val チェック値

package/dist/vtecxnext.js

@@ -26,9 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBQCsv = exports.execBQ = exports.getBQ = exports.deleteBQ = exports.postBQ = exports.getPage = exports.pagination = exports.getSessionLong = exports.getSessionString = exports.getSessionEntry = exports.getSessionFeed = exports.deleteSessionLong = exports.deleteSessionString = exports.deleteSessionEntry = exports.deleteSessionFeed = exports.incrementSession = exports.setSessionLong = exports.setSessionString = exports.setSessionEntry = exports.setSessionFeed = exports.getRangeids = exports.rangeids = exports.setids = exports.getids = exports.addids = exports.allocids = exports.deleteFolder = exports.deleteEntry = exports.put = exports.post = exports.countResponse = exports.count = exports.getFeedResponse = exports.getFeed = exports.getEntry = exports.log = exports.rxid = exports.service = exports.isLoggedin = exports.whoami = exports.account = exports.uid = exports.now = exports.logout = exports.loginWithTotp = exports.loginWithRxid = exports.login = exports.sendMessage = exports.checkXRequestedWith = exports.hello = void 0;
-exports.VtecxNextError = exports.VtecxResponse = exports.isBlank = exports.changeTdid = exports.deleteTotp = exports.createTotp = exports.getTotpLink = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = exports.getcontenturl = exports.getcontent = exports.deletecontent = exports.putcontent = exports.savefiles = exports.deleteusers = exports.deleteuser = exports.canceluser = exports.activateusers = exports.activateuser = exports.revokeusers = exports.revokeuser = exports.userstatus = exports.changeaccount_verify = exports.changeaccount = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.isAdmin = exports.isGroupMember = exports.getGroups = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = void 0;
-exports.FetchError = void 0;
+exports.execBQ = exports.getBQ = exports.deleteBQ = exports.postBQ = exports.getPage = exports.pagination = exports.getSessionLong = exports.getSessionString = exports.getSessionEntry = exports.getSessionFeed = exports.deleteSessionLong = exports.deleteSessionString = exports.deleteSessionEntry = exports.deleteSessionFeed = exports.incrementSession = exports.setSessionLong = exports.setSessionString = exports.setSessionEntry = exports.setSessionFeed = exports.getRangeids = exports.rangeids = exports.setids = exports.getids = exports.addids = exports.allocids = exports.clearFolder = exports.deleteFolder = exports.deleteEntry = exports.put = exports.post = exports.countResponse = exports.count = exports.getFeedResponse = exports.getFeed = exports.getEntry = exports.log = exports.rxid = exports.service = exports.isLoggedin = exports.whoami = exports.account = exports.uid = exports.now = exports.logout = exports.loginWithTotp = exports.loginWithRxid = exports.login = exports.sendMessage = exports.checkXRequestedWith = exports.hello = void 0;
+exports.mergeOAuthUserLine = exports.changeTdid = exports.deleteTotp = exports.createTotp = exports.getTotpLink = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = exports.getcontenturl = exports.getcontent = exports.deletecontent = exports.putcontent = exports.savefiles = exports.deleteusers = exports.deleteuser = exports.canceluser = exports.activateusers = exports.activateuser = exports.revokeusers = exports.revokeuser = exports.userstatus = exports.changeaccount_verify = exports.changeaccount = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.isAdmin = exports.isGroupMember = exports.getGroups = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.getMessageQueueStatus = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = exports.getBQCsv = void 0;
+exports.FetchError = exports.VtecxNextError = exports.VtecxResponse = exports.isBlank = void 0;
 const sqlstring_1 = __importDefault(require("sqlstring"));
 const formidable_1 = __importDefault(require("formidable"));
 const fs_1 = __importDefault(require("fs"));
@@ -692,6 +692,38 @@ const deleteFolder = async (req, res, uri, async, targetService) => {
     return true;
 };
 exports.deleteFolder = deleteFolder;
+/**
+ * clear folder
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri parent key
+ * @param async execute async
+ * @return true if successful
+ */
+const clearFolder = async (req, res, uri, async, targetService) => {
+    //console.log(`[vtecxnext clearFolder] start. uri=${uri} async=${async}`)
+    // キー入力値チェック
+    checkUri(uri);
+    // vte.cxへリクエスト
+    const method = 'DELETE';
+    const url = `${SERVLETPATH_PROVIDER}${uri}?_clearfolder${async ? '&_async' : ''}`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req, null, null, targetService);
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext clearFolder] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    if (res) {
+        setCookie(response, res);
+    }
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return true;
+};
+exports.clearFolder = clearFolder;
 /**
  * allocate numbers
  * @param req request (for authentication)
@@ -908,7 +940,6 @@ exports.getRangeids = getRangeids;
  * @return true if successful
  */
 const setSessionFeed = async (req, res, name, feed) => {
-    //console.log(`[vtecxnext setSessionFeed] start. name=${name} feed=${feed}`)
     // 入力チェック
     checkNotNull(name, 'Name');
     checkNotNull(feed, 'Feed');
@@ -1867,6 +1898,36 @@ const setMessageQueueStatus = async (req, res, flag, channel) => {
     return true;
 };
 exports.setMessageQueueStatus = setMessageQueueStatus;
+/**
+ * get status of MessageQueue.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param name name
+ * @return feed
+ */
+const getMessageQueueStatus = async (req, res, channel) => {
+    //console.log(`[vtecxnext getMessageQueueStatus] start. channel=${channel}`)
+    // 入力チェック
+    checkUri(channel);
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = `${SERVLETPATH_PROVIDER}${channel}?_mqstatus`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req);
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext getMessageQueueStatus] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    return await getJson(response);
+};
+exports.getMessageQueueStatus = getMessageQueueStatus;
 /**
  * set MessageQueue.
  * @param req request (for authentication)
@@ -1899,7 +1960,7 @@ const setMessageQueue = async (req, res, feed, channel) => {
 };
 exports.setMessageQueue = setMessageQueue;
 /**
- * get feed from session
+ * get messageQueue.
  * @param req request (for authentication)
  * @param res response (for authentication)
  * @param name name
@@ -3014,6 +3075,18 @@ const changeTdid = async (req, res) => {
     return await getJson(response);
 };
 exports.changeTdid = changeTdid;
+/**
+ * Merge an existing user with an line oauth user.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param rxid RXID
+ * @return message feed
+ */
+const mergeOAuthUserLine = async (req, res, rxid) => {
+    //console.log(`[vtecxnext mergeOAuthUserLine] start. feed=${feed}`)
+    return mergeOAuthUser(req, res, 'line', rxid);
+};
+exports.mergeOAuthUserLine = mergeOAuthUserLine;
 /**
  * null、undefined、空文字の判定
  * @param val チェック値
@@ -3084,6 +3157,7 @@ const requestVtecx = async (method, url, req, body, additionalHeaders, targetSer
     const cookie = req ? req.headers['cookie'] : undefined;
     const headers = cookie ? { 'Cookie': cookie } : {};
     if (additionalHeaders) {
+        //console.log(`[vtecxnext requestVtecx] additionalHeaders for`)
         for (const key in additionalHeaders) {
             headers[key] = additionalHeaders[key];
         }
@@ -3652,3 +3726,34 @@ const createURLSearchParams = (data) => {
     Object.keys(data).forEach(key => params.append(key, data[key]));
     return params;
 };
+/**
+ * Merge an existing user with an oauth user.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param provider OAuth provider name
+ * @param rxid RXID
+ * @return message feed
+ */
+const mergeOAuthUser = async (req, res, provider, rxid) => {
+    //console.log(`[vtecxnext mergeOAuthUser] start. feed=${feed}`)
+    // 入力チェック
+    checkNotNull(provider, 'Provider');
+    checkNotNull(rxid, 'RXID');
+    // vte.cxへリクエスト
+    const method = 'PUT';
+    const url = `${SERVLETPATH_DATA}/?_mergeoauthuser`;
+    const feed = { 'feed': { 'subtitle': provider, 'rights': rxid } };
+    let response;
+    try {
+        response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext mergeOAuthUser] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return await getJson(response);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [
@@ -22,14 +22,14 @@
   },
   "homepage": "https://github.com/reflexworks/vtecxnext#readme",
   "devDependencies": {
-    "@types/formidable": "^2.0.5",
-    "@types/node": "^18.16.12",
+    "@types/formidable": "^2.0.6",
+    "@types/node": "^20.4.5",
     "@types/sqlstring": "^2.3.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.1.6"
   },
   "dependencies": {
-    "formidable": "^2.1.1",
+    "formidable": "^2.1.2",
     "sqlstring": "^2.3.3"
   }
 }