@vtecx/vtecxnext 2.2.10 → 2.2.12

package/dist/vtecxnext.d.ts

@@ -81,7 +81,7 @@ export declare class VtecxNext {
     null2blank: (val: string | undefined | null) => string;
     /**
      * X-Requested-With header check.
-     * If not specified, set status 417 to the response.
+     * If not specified, set status 401 to the response.
      * @return Response if no X-Requested-With header is specified
      */
     checkXRequestedWith: () => Response | undefined;
@@ -618,6 +618,13 @@ export declare class VtecxNext {
      * @return feed
      */
     leaveGroup: (group: string) => Promise<boolean>;
+    /**
+     * leave group by admin
+     * @param uids uid list
+     * @param group group
+     * @return feed
+     */
+    leaveGroupByAdmin: (uids: string[], group: string) => Promise<any>;
     /**
      * 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)

package/dist/vtecxnext.js

@@ -143,7 +143,7 @@ class VtecxNext {
     };
     /**
      * X-Requested-With header check.
-     * If not specified, set status 417 to the response.
+     * If not specified, set status 401 to the response.
      * @return Response if no X-Requested-With header is specified
      */
     checkXRequestedWith = () => {
@@ -155,9 +155,9 @@ class VtecxNext {
         this.req.headers.forEach((value, key, parent) => {
             //console.log(`[vtecxnext checkXRequestedWith] key=${key} value=${value}`)
             if (!hasX) {
-                if ((key.startsWith('x-') || key.startsWith('X-')) &&
-                    key.indexOf('invoke') === -1 &&
-                    value !== undefined && value !== '') {
+                const keyLower = key.toLocaleLowerCase();
+                if ((keyLower.startsWith('x-') && !keyLower.startsWith('x-forwarded')) ||
+                    keyLower === 'authorization') {
                     //console.log(`[vtecxnext checkXRequestedWith] key=${key} value=${value}`)
                     hasX = true;
                 }
@@ -166,7 +166,7 @@ class VtecxNext {
         //console.log(`[vtecxnext checkXRequestedWith] end.`)
         if (!hasX) {
             return new Response('', {
-                status: 417
+                status: 401
             });
         }
     };
@@ -2358,7 +2358,7 @@ class VtecxNext {
         // 入力チェック
         checkUri(group);
         // vte.cxへリクエスト
-        const method = 'DELETE';
+        const method = 'PUT';
         const url = `${SERVLETPATH_PROVIDER}${group}?_leavegroup`;
         let response;
         try {
@@ -2375,6 +2375,41 @@ class VtecxNext {
         // 戻り値
         return true;
     };
+    /**
+     * leave group by admin
+     * @param uids uid list
+     * @param group group
+     * @return feed
+     */
+    leaveGroupByAdmin = async (uids, group) => {
+        //console.log(`[vtecxnext leaveGroupByAdmin] start. group=${group} uids=${uids}`)
+        // 入力チェック
+        checkUri(group, 'group key');
+        checkNotNull(uids, 'uid');
+        // vte.cxへリクエスト
+        const method = 'PUT';
+        const url = `${SERVLETPATH_PROVIDER}${group}?_leavegroupByAdmin`;
+        const feed = [];
+        for (const uid of uids) {
+            const entry = { 'link': [{ '___rel': 'self', '___href': `/_user/${uid}` }] };
+            feed.push(entry);
+        }
+        const value = JSON.stringify(feed);
+        let response;
+        try {
+            response = await this.requestVtecx(method, url, value);
+        }
+        catch (e) {
+            throw newFetchError(e, true);
+        }
+        //console.log(`[vtecxnext leaveGroupByAdmin] response. status=${response.status}`)
+        // vte.cxからのset-cookieを転記
+        this.setCookie(response);
+        // レスポンスのエラーチェック
+        await checkVtecxResponse(response);
+        // 戻り値
+        return await getJson(response);
+    };
     /**
      * 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)

package/package.json

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