@vtecx/vtecxnext 1.0.7 → 1.0.9

package/dist/vtecxnext.d.ts

@@ -509,6 +509,29 @@ export declare const leaveGroup: (req: IncomingMessage, res: ServerResponse, gro
  * @return feed (entry array)
  */
 export declare const noGroupMember: (req: IncomingMessage, res: ServerResponse, uri: string) => Promise<any>;
+/**
+ * Get groups
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri group key
+ * @return feed (entry array)
+ */
+export declare const getGroups: (req: IncomingMessage, res: ServerResponse) => Promise<any>;
+/**
+ * whether you are in the group
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri group key
+ * @return true/false
+ */
+export declare const isGroupMember: (req: IncomingMessage, res: ServerResponse, uri: string) => Promise<boolean>;
+/**
+ * whether you are in the admin group
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @return true/false
+ */
+export declare const isAdmin: (req: IncomingMessage, res: ServerResponse) => Promise<boolean>;
 /**
  * add user
  * @param req request (for authentication)

package/dist/vtecxnext.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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.FetchError = exports.VtecxNextError = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = 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.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = void 0;
+exports.FetchError = exports.VtecxNextError = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = 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 = void 0;
 const sqlstring_1 = __importDefault(require("sqlstring"));
 const formidable_1 = __importDefault(require("formidable"));
 const fs_1 = __importDefault(require("fs"));
@@ -1915,6 +1915,75 @@ const noGroupMember = async (req, res, uri) => {
     return await getJson(response);
 };
 exports.noGroupMember = noGroupMember;
+/**
+ * Get groups
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri group key
+ * @return feed (entry array)
+ */
+const getGroups = async (req, res) => {
+    //console.log('[vtecxnext getGroups] start.')
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = `/d/?_group`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req);
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext getGroups] response=${response}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    return await getJson(response);
+};
+exports.getGroups = getGroups;
+/**
+ * whether you are in the group
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri group key
+ * @return true/false
+ */
+const isGroupMember = async (req, res, uri) => {
+    //console.log('[vtecxnext noGroupMember] start.')
+    // キー入力値チェック
+    checkUri(uri);
+    // vte.cxへリクエスト
+    const method = 'GET';
+    const url = `/d${uri}?_is_group_member`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req);
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext noGroupMember] response=${response}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    // 戻り値
+    const data = await getJson(response);
+    return data?.feed?.title === 'true' ? true : false;
+};
+exports.isGroupMember = isGroupMember;
+/**
+ * whether you are in the admin group
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @return true/false
+ */
+const isAdmin = async (req, res) => {
+    return await (0, exports.isGroupMember)(req, res, '/_group/$admin');
+};
+exports.isAdmin = isAdmin;
 /**
  * add user
  * @param req request (for authentication)
@@ -2827,8 +2896,12 @@ const fetchProc = (url, requestInit) => {
  * @param res ブラウザへのレスポンス
  */
 const setCookie = (response, res) => {
-    const setCookieVal = response.headers.get('set-cookie');
+    let setCookieVal = response.headers.get('set-cookie');
     if (setCookieVal === '' || setCookieVal) {
+        if (setCookieVal !== '' && setCookieVal.indexOf('SameSite') < 0) {
+            setCookieVal += '; SameSite=Lax';
+        }
+        //console.log(`[vtecxnext setCookie] value : ${setCookieVal}`)
         res.setHeader('set-cookie', setCookieVal);
     }
 };

package/package.json

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