@vtecx/vtecxnext 1.1.6 → 1.1.8

package/dist/vtecxnext.d.ts

@@ -816,6 +816,12 @@ export declare const deleteTotp: (req: IncomingMessage, res: ServerResponse, acc
  * @return message
  */
 export declare const changeTdid: (req: IncomingMessage, res: ServerResponse) => Promise<any>;
+/**
+ * null、undefined、空文字の判定
+ * @param val チェック値
+ * @returns null、undefined、空文字の場合true
+ */
+export declare const isBlank: (val: any) => boolean;
 /**
  * response class
  */

package/dist/vtecxnext.js

@@ -27,7 +27,8 @@ var __importDefault = (this && this.__importDefault) || function (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.FetchError = exports.VtecxNextError = exports.VtecxResponse = 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.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;
 const sqlstring_1 = __importDefault(require("sqlstring"));
 const formidable_1 = __importDefault(require("formidable"));
 const fs_1 = __importDefault(require("fs"));
@@ -1346,7 +1347,7 @@ exports.pagination = pagination;
  * @return feed Maximum number of pages in the specified page range, and total count.
  */
 const getPage = async (req, res, uri, num, targetService) => {
-    //console.log('[vtecxnext getPage] start.')
+    //console.log(`[vtecxnext getPage] start. uri=${uri} num=${num}`)
     // 入力値チェック
     checkUri(uri);
     checkNotNull(num, 'page number');
@@ -3013,6 +3014,18 @@ const changeTdid = async (req, res) => {
     return await getJson(response);
 };
 exports.changeTdid = changeTdid;
+/**
+ * null、undefined、空文字の判定
+ * @param val チェック値
+ * @returns null、undefined、空文字の場合true
+ */
+const isBlank = (val) => {
+    if (val === null || val === undefined || val === '') {
+        return true;
+    }
+    return false;
+};
+exports.isBlank = isBlank;
 //---------------------------------------------
 /**
  * response class
@@ -3077,7 +3090,18 @@ const requestVtecx = async (method, url, req, body, additionalHeaders, targetSer
     }
     if (targetService) {
         // サービス連携の場合
-        const servicekey = process.env[`SERVICEKEY_${targetService}`];
+        let servicekey = process.env[`SERVICEKEY_${targetService}`];
+        if (!servicekey) {
+            const max = 10;
+            for (let i = 1; i <= max; i++) {
+                const iStr = String(i);
+                const tmpServiceName = process.env[`SERVICELINKAGE_${iStr}`];
+                if (targetService == tmpServiceName) {
+                    servicekey = process.env[`SERVICEKEY_${iStr}`];
+                    break;
+                }
+            }
+        }
         //console.log(`[requestVtecx] targetService=${targetService} servicekey=${servicekey}`)
         if (servicekey) {
             headers['X-SERVICELINKAGE'] = targetService;
@@ -3267,7 +3291,7 @@ const checkVtecxResponse = async (response) => {
  * @returns 戻り値はなし。エラーの場合VtecxNextErrorをスロー。
  */
 const checkNotNull = (val, name) => {
-    if (!val) {
+    if ((0, exports.isBlank)(val)) {
         throw new VtecxNextError(400, `${name ?? 'Key'} is required.`);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [