@vtecx/vtecxnext 1.0.1 → 1.0.2

package/dist/vtecxnext.d.ts

@@ -30,6 +30,15 @@ export declare const sendMessage: (res: ServerResponse, statusCode: number, mess
  * @return true if log in has been successful.
  */
 export declare const login: (req: IncomingMessage, res: ServerResponse, wsse: string, reCaptchaToken?: string) => Promise<boolean>;
+/**
+ * login with RXID.
+ * If the login is successful, sets the authentication information in a cookie.
+ * @param req request
+ * @param res response
+ * @param rxid RXID
+ * @return true if log in has been successful.
+ */
+export declare const loginWithRxid: (req: IncomingMessage, res: ServerResponse, rxid: string) => Promise<boolean>;
 /**
  * logout.
  * If the logout is successful, delete the authentication information in a cookie.
@@ -38,6 +47,11 @@ export declare const login: (req: IncomingMessage, res: ServerResponse, wsse: st
  * @return true if log out has been successful.
  */
 export declare const logout: (req: IncomingMessage, res: ServerResponse) => Promise<boolean>;
+/**
+ * get current datetime
+ * @return current datetime
+ */
+export declare const now: () => Promise<string>;
 /**
  * get login uid
  * @param req request
@@ -45,6 +59,13 @@ export declare const logout: (req: IncomingMessage, res: ServerResponse) => Prom
  * @return uid
  */
 export declare const uid: (req: IncomingMessage, res: ServerResponse) => Promise<string>;
+/**
+ * get login account
+ * @param req request
+ * @param res response
+ * @return account
+ */
+export declare const account: (req: IncomingMessage, res: ServerResponse) => Promise<string>;
 /**
  * get login whoami
  * @param req request (for authentication)
@@ -59,6 +80,20 @@ export declare const whoami: (req: IncomingMessage, res: ServerResponse) => Prom
  * @return true if logged in
  */
 export declare const isLoggedin: (req: IncomingMessage, res: ServerResponse) => Promise<boolean>;
+/**
+ * get login service
+ * @param req request
+ * @param res response
+ * @return service
+ */
+export declare const service: (req: IncomingMessage, res: ServerResponse) => Promise<string>;
+/**
+ * get RXID
+ * @param req request
+ * @param res response
+ * @return RXID
+ */
+export declare const rxid: (req: IncomingMessage, res: ServerResponse) => Promise<string>;
 /**
  * register a log entry
  * @param req request (for authentication)
@@ -462,6 +497,58 @@ export declare const joinGroup: (req: IncomingMessage, res: ServerResponse, grou
  * @return feed
  */
 export declare const leaveGroup: (req: IncomingMessage, res: ServerResponse, group: string) => Promise<boolean>;
+/**
+ * Get entries that have entries in a group, but are not in the group.
+ * (for entries with no signature or with an incorrect signature, if the user group requires a signature)
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri group key
+ * @return feed (entry array)
+ */
+export declare const noGroupMember: (req: IncomingMessage, res: ServerResponse, uri: string) => Promise<any>;
+/**
+ * add user
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @param reCaptchaToken reCAPTCHA token
+ * @return message feed
+ */
+export declare const adduser: (req: IncomingMessage, res: ServerResponse, feed: any, reCaptchaToken: string) => Promise<any>;
+/**
+ * add user by user admin
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entries (JSON)
+ * @param reCaptchaToken reCAPTCHA token
+ * @return message feed
+ */
+export declare const adduserByAdmin: (req: IncomingMessage, res: ServerResponse, feed: any) => Promise<any>;
+/**
+ * Send email for password reset
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @param reCaptchaToken reCAPTCHA token
+ * @return message feed
+ */
+export declare const passreset: (req: IncomingMessage, res: ServerResponse, feed: any, reCaptchaToken?: string) => Promise<any>;
+/**
+ * change password
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @return message feed
+ */
+export declare const changepass: (req: IncomingMessage, res: ServerResponse, feed: any) => Promise<any>;
+/**
+ * change password by user admin
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @return message feed
+ */
+export declare const changepassByAdmin: (req: IncomingMessage, res: ServerResponse, feed: any) => Promise<any>;
 /**
  * Error returned from vte.cx
  */

package/dist/vtecxnext.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setMessageQueue = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = exports.getBQCsv = 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.count = exports.getFeed = exports.getEntry = exports.log = exports.isLoggedin = exports.whoami = exports.uid = exports.logout = exports.login = exports.sendMessage = exports.checkXRequestedWith = exports.hello = void 0;
-exports.VtecxNextError = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = void 0;
+exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = exports.getBQCsv = 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.count = exports.getFeed = exports.getEntry = exports.log = exports.rxid = exports.service = exports.isLoggedin = exports.whoami = exports.account = exports.uid = exports.now = exports.logout = exports.loginWithRxid = exports.login = exports.sendMessage = exports.checkXRequestedWith = exports.hello = void 0;
+exports.VtecxNextError = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = void 0;
 var SqlString = require('sqlstring');
 /**
  * Hello world.
@@ -76,6 +76,38 @@ const login = async (req, res, wsse, reCaptchaToken) => {
     return isLoggedin;
 };
 exports.login = login;
+/**
+ * login with RXID.
+ * If the login is successful, sets the authentication information in a cookie.
+ * @param req request
+ * @param res response
+ * @param rxid RXID
+ * @return true if log in has been successful.
+ */
+const loginWithRxid = async (req, res, rxid) => {
+    //console.log('[vtecxnext loginWithRxid] start.')
+    // 入力チェック
+    checkNotNull(rxid, 'Authentication information');
+    // ログイン
+    // reCAPTCHA tokenは任意
+    const method = 'GET';
+    const url = `/d/?_login&_RXID=${rxid}`;
+    const response = await requestVtecx(method, url, req);
+    const feed = await response.json();
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    let isLoggedin;
+    if (response.status < 400) {
+        isLoggedin = true;
+    }
+    else {
+        isLoggedin = false;
+    }
+    //console.log(`[vtecxnext loginWithRxid] end. status=${response.status} message=${feed.title}`)
+    return isLoggedin;
+};
+exports.loginWithRxid = loginWithRxid;
 /**
  * logout.
  * If the logout is successful, delete the authentication information in a cookie.
@@ -101,6 +133,24 @@ const logout = async (req, res) => {
     return true;
 };
 exports.logout = logout;
+/**
+ * get current datetime
+ * @return current datetime
+ */
+const now = async () => {
+    //console.log('[vtecxnext now] start.')
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = '/d/?_now';
+    const response = await requestVtecx(method, url);
+    //console.log(`[vtecxnext now] response=${response}`)
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    const data = await getJson(response);
+    return data.feed.title;
+};
+exports.now = now;
 /**
  * get login uid
  * @param req request
@@ -123,6 +173,28 @@ const uid = async (req, res) => {
     return data.feed.title;
 };
 exports.uid = uid;
+/**
+ * get login account
+ * @param req request
+ * @param res response
+ * @return account
+ */
+const account = async (req, res) => {
+    //console.log('[vtecxnext account] start.')
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = '/d/?_account';
+    const response = await requestVtecx(method, url, req);
+    //console.log(`[vtecxnext account] response=${response}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    const data = await getJson(response);
+    return data.feed.title;
+};
+exports.account = account;
 /**
  * get login whoami
  * @param req request (for authentication)
@@ -161,6 +233,50 @@ const isLoggedin = async (req, res) => {
     }
 };
 exports.isLoggedin = isLoggedin;
+/**
+ * get login service
+ * @param req request
+ * @param res response
+ * @return service
+ */
+const service = async (req, res) => {
+    //console.log('[vtecxnext service] start.')
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = '/d/?_service';
+    const response = await requestVtecx(method, url, req);
+    //console.log(`[vtecxnext service] response=${response}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    const data = await getJson(response);
+    return data.feed.title;
+};
+exports.service = service;
+/**
+ * get RXID
+ * @param req request
+ * @param res response
+ * @return RXID
+ */
+const rxid = async (req, res) => {
+    //console.log('[vtecxnext service] start.')
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = '/d/?_getrxid';
+    const response = await requestVtecx(method, url, req);
+    //console.log(`[vtecxnext uid] response=${response}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    const data = await getJson(response);
+    return data.feed.title;
+};
+exports.rxid = rxid;
 /**
  * register a log entry
  * @param req request (for authentication)
@@ -1414,6 +1530,151 @@ const leaveGroup = async (req, res, group) => {
     return true;
 };
 exports.leaveGroup = leaveGroup;
+/**
+ * Get entries that have entries in a group, but are not in the group.
+ * (for entries with no signature or with an incorrect signature, if the user group requires a signature)
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri group key
+ * @return feed (entry array)
+ */
+const noGroupMember = async (req, res, uri) => {
+    //console.log('[vtecxnext noGroupMember] start.')
+    // キー入力値チェック
+    checkUri(uri);
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = `/d${uri}?_no_group_member`;
+    const response = await requestVtecx(method, url, req);
+    //console.log(`[vtecxnext noGroupMember] response=${response}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    return await getJson(response);
+};
+exports.noGroupMember = noGroupMember;
+/**
+ * add user
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @param reCaptchaToken reCAPTCHA token
+ * @return message feed
+ */
+const adduser = async (req, res, feed, reCaptchaToken) => {
+    //console.log(`[vtecxnext adduser] start. feed=${feed}`)
+    // 入力チェック
+    checkNotNull(feed, 'Feed');
+    // vte.cxへリクエスト
+    const method = 'POST';
+    const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
+    const url = `/d/?_adduser${param}`;
+    const response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    //console.log(`[vtecxnext adduser] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return await getJson(response);
+};
+exports.adduser = adduser;
+/**
+ * add user by user admin
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entries (JSON)
+ * @param reCaptchaToken reCAPTCHA token
+ * @return message feed
+ */
+const adduserByAdmin = async (req, res, feed) => {
+    //console.log(`[vtecxnext adduserByAdmin] start. feed=${feed}`)
+    // 入力チェック
+    checkNotNull(feed, 'Feed');
+    // vte.cxへリクエスト
+    const method = 'POST';
+    const url = `/d/?_adduserByAdmin`;
+    const response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    //console.log(`[vtecxnext adduserByAdmin] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return await getJson(response);
+};
+exports.adduserByAdmin = adduserByAdmin;
+/**
+ * Send email for password reset
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @param reCaptchaToken reCAPTCHA token
+ * @return message feed
+ */
+const passreset = async (req, res, feed, reCaptchaToken) => {
+    //console.log(`[vtecxnext passreset] start. feed=${feed}`)
+    // 入力チェック
+    checkNotNull(feed, 'Feed');
+    // vte.cxへリクエスト
+    const method = 'POST';
+    const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
+    const url = `/d/?_passreset${param}`;
+    const response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    //console.log(`[vtecxnext passreset] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return await getJson(response);
+};
+exports.passreset = passreset;
+/**
+ * change password
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @return message feed
+ */
+const changepass = async (req, res, feed) => {
+    //console.log(`[vtecxnext changepass] start. feed=${feed}`)
+    // 入力チェック
+    checkNotNull(feed, 'Feed');
+    // vte.cxへリクエスト
+    const method = 'PUT';
+    const url = `/d/?_changephash`;
+    const response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    //console.log(`[vtecxnext changepass] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return await getJson(response);
+};
+exports.changepass = changepass;
+/**
+ * change password by user admin
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param feed entry (JSON)
+ * @return message feed
+ */
+const changepassByAdmin = async (req, res, feed) => {
+    //console.log(`[vtecxnext changepassByAdmin] start. feed=${feed}`)
+    // 入力チェック
+    checkNotNull(feed, 'Feed');
+    // vte.cxへリクエスト
+    const method = 'PUT';
+    const url = `/d/?_changephashByAdmin`;
+    const response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    //console.log(`[vtecxnext changepassByAdmin] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    return await getJson(response);
+};
+exports.changepassByAdmin = changepassByAdmin;
 //---------------------------------------------
 /**
  * Error returned from vte.cx
@@ -1439,11 +1700,12 @@ exports.VtecxNextError = VtecxNextError;
  */
 const requestVtecx = async (method, url, req, body, targetService) => {
     // cookieの値をvte.cxへのリクエストヘッダに設定
-    const cookie = req.headers['cookie'];
-    const headers = { 'Cookie': cookie };
+    const cookie = req ? req.headers['cookie'] : undefined;
+    const headers = cookie ? { 'Cookie': cookie } : {};
     if (targetService) {
+        // サービス連携の場合
         const servicekey = process.env[`SERVICEKEY_${targetService}`];
-        console.log(`[requestVtecx] targetService=${targetService} servicekey=${servicekey}`);
+        //console.log(`[requestVtecx] targetService=${targetService} servicekey=${servicekey}`)
         if (servicekey) {
             headers['X-SERVICELINKAGE'] = targetService;
             headers['X-SERVICEKEY'] = servicekey;
@@ -1640,9 +1902,3 @@ const getLinks = (rel, hrefs) => {
     //console.log(`[vtecxnext getLinks] links=${JSON.stringify(links)}`)
     return links;
 };
-const getServiceKey = (targetService) => {
-    if (!targetService) {
-        return null;
-    }
-    // 環境変数
-};

package/package.json

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