@vtecx/vtecxnext 3.1.2 → 3.1.3

package/dist/vtecxnext.d.ts

@@ -258,6 +258,14 @@ export declare class VtecxNext {
      * @return status and message
      */
     login: (wsse: string, reCaptchaToken?: string) => Promise<StatusMessage>;
+    /**
+     * login with WSSE-APIKEY.
+     * Request authentication with WSSE-APIKEY.
+     * If the login is successful, sets the authentication information in a cookie.
+     * @param wsse WSSE-APIKEY
+     * @return status and message
+     */
+    loginWithWsseApiKey: (wsse: string) => Promise<StatusMessage>;
     /**
      * login with RXID.
      * If the login is successful, sets the authentication information in a cookie.
@@ -1059,11 +1067,12 @@ export declare class VtecxNext {
      */
     changeTdid: () => Promise<MessageResponse>;
     /**
+     * @deprecated
      * Merge an existing user with an line oauth user.
-     * @param rxid RXID
+     * @param wsseApikey WSSE-APIKEY
      * @return user entry
      */
-    mergeOAuthUserLine: (rxid: string) => Promise<Entry>;
+    mergeOAuthUserLine: (wsseApikey: string) => Promise<Entry>;
     /**
      * create group admin
      * @param CreateGroupadminInfo group name and uid list
@@ -1184,9 +1193,10 @@ export declare class VtecxNext {
      */
     private oauthLink;
     /**
+     * @deprecated
      * Merge an existing user with an oauth user.
      * @param provider OAuth provider name
-     * @param rxid RXID
+     * @param wsseApikey WSSE-APIKEY
      * @return user entry
      */
     private mergeOAuthUser;

package/dist/vtecxnext.js

@@ -407,7 +407,7 @@ class VtecxNext {
         checkNotNull(wsse, 'Authentication information');
         // ログイン
         // reCAPTCHA tokenは任意
-        const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
+        const param = reCaptchaToken ? `&g-recaptcha-token=${encodeURIComponent(reCaptchaToken)}` : '';
         const method = 'GET';
         const url = `${SERVLETPATH_DATA}/?_login${param}`;
         const headers = { 'X-WSSE': `${wsse}` };
@@ -425,6 +425,36 @@ class VtecxNext {
         const data = await response.json();
         return { status: response.status, message: data.feed.title };
     };
+    /**
+     * login with WSSE-APIKEY.
+     * Request authentication with WSSE-APIKEY.
+     * If the login is successful, sets the authentication information in a cookie.
+     * @param wsse WSSE-APIKEY
+     * @return status and message
+     */
+    loginWithWsseApiKey = async (wsse) => {
+        //console.log('[vtecxnext login] start.')
+        // 入力チェック
+        checkNotNull(wsse, 'Authentication information');
+        // ログイン
+        const param = '';
+        const method = 'GET';
+        const url = `${SERVLETPATH_DATA}/?_login${param}`;
+        const headers = { 'X-WSSE-APIKEY': `${wsse}` };
+        let response;
+        try {
+            response = await this.requestVtecx(method, url, null, headers);
+        }
+        catch (e) {
+            throw newFetchError(e, true);
+        }
+        // vte.cxからのset-cookieを転記
+        this.setCookie(response);
+        // 引き続きAPIで処理を行う場合のため、set-cookie情報を保持しておく
+        this.setLoginCookie(response);
+        const data = await response.json();
+        return { status: response.status, message: data.feed.title };
+    };
     /**
      * login with RXID.
      * If the login is successful, sets the authentication information in a cookie.
@@ -1141,7 +1171,7 @@ class VtecxNext {
         checkNotNull(feed, 'Feed');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionfeed=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionfeed=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url, JSON.stringify(feed));
@@ -1169,7 +1199,7 @@ class VtecxNext {
         checkNotNull(entry, 'Entry');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionentry=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionentry=${encodeURIComponent(name)}`;
         const feed = { feed: { entry: [entry] } };
         let response;
         try {
@@ -1198,7 +1228,7 @@ class VtecxNext {
         checkNotNull(str, 'String');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionstring=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionstring=${encodeURIComponent(name)}`;
         const feed = { feed: { title: str } };
         let response;
         try {
@@ -1227,7 +1257,7 @@ class VtecxNext {
         checkNotNull(num, 'Number');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionlong=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionlong=${encodeURIComponent(name)}`;
         const feed = { feed: { title: String(num) } };
         let response;
         try {
@@ -1256,7 +1286,7 @@ class VtecxNext {
         checkNotNull(num, 'Number');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionincr=${name}&_num=${num}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionincr=${encodeURIComponent(name)}&_num=${num}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1284,7 +1314,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'DELETE';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionfeed=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionfeed=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1310,7 +1340,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'DELETE';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionentry=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionentry=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1336,7 +1366,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'DELETE';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionstring=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionstring=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1362,7 +1392,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'DELETE';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionlong=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionlong=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1388,7 +1418,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionfeed=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionfeed=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1415,7 +1445,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionentry=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionentry=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1442,7 +1472,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionstring=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionstring=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1475,7 +1505,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_PROVIDER}/?_sessionlong=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_sessionlong=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -1510,7 +1540,7 @@ class VtecxNext {
         checkUri(uri);
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_PROVIDER}${uri}${uri.includes('?') ? '&' : '?'}_pagination=${pagerange}`;
+        const url = `${SERVLETPATH_PROVIDER}${uri}${uri.includes('?') ? '&' : '?'}_pagination=${encodeURIComponent(pagerange)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url, null, null, targetService);
@@ -1772,7 +1802,7 @@ class VtecxNext {
         const feed = editSqlArgument(sql, values, parent);
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_querybq&_csv${filename ? '=' + filename : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_querybq&_csv${filename ? '=' + encodeURIComponent(filename) : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url, JSON.stringify(feed));
@@ -1973,7 +2003,7 @@ class VtecxNext {
         const feed = editSqlArgument(sql, values, parent);
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_queryrdb&_csv${filename ? '=' + filename : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_queryrdb&_csv${filename ? '=' + encodeURIComponent(filename) : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url, JSON.stringify(feed));
@@ -2047,7 +2077,7 @@ class VtecxNext {
         checkNotNull(htmlTemplate, 'PDF template');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_pdf${filename ? '=' + filename : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_pdf${filename ? '=' + encodeURIComponent(filename) : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url, htmlTemplate);
@@ -2453,7 +2483,7 @@ class VtecxNext {
         //checkNotNull(selfid, 'selfid (hierarchical name under my group alias)')
         // vte.cxへリクエスト
         const method = 'POST';
-        const url = `${SERVLETPATH_PROVIDER}${group}?_addgroup${selfid ? '&_selfid=' + selfid : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}${group}?_addgroup${selfid ? '&_selfid=' + encodeURIComponent(selfid) : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -2485,7 +2515,7 @@ class VtecxNext {
         //checkNotNull(selfid, 'selfid (hierarchical name under my group alias)')
         // vte.cxへリクエスト
         const method = 'POST';
-        const url = `${SERVLETPATH_PROVIDER}${group}?_addgroupByAdmin${selfid ? '&_selfid=' + selfid : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}${group}?_addgroupByAdmin${selfid ? '&_selfid=' + encodeURIComponent(selfid) : ''}`;
         const feed = [];
         for (const uid of uids) {
             const entry = { link: [{ ___rel: 'self', ___href: `/_user/${uid}` }] };
@@ -2520,7 +2550,7 @@ class VtecxNext {
         //checkNotNull(selfid, 'selfid (hierarchical name under my group alias)')
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}${group}?_joingroup${selfid ? '&_selfid=' + selfid : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}${group}?_joingroup${selfid ? '&_selfid=' + encodeURIComponent(selfid) : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -2713,7 +2743,7 @@ class VtecxNext {
         const feed = [entry];
         // vte.cxへリクエスト
         const method = 'POST';
-        const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
+        const param = reCaptchaToken ? `&g-recaptcha-token=${encodeURIComponent(reCaptchaToken)}` : '';
         const url = `${SERVLETPATH_DATA}/?_adduser${param}`;
         let response;
         try {
@@ -2829,7 +2859,7 @@ class VtecxNext {
         const feed = [entry];
         // vte.cxへリクエスト
         const method = 'POST';
-        const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
+        const param = reCaptchaToken ? `&g-recaptcha-token=${encodeURIComponent(reCaptchaToken)}` : '';
         const url = `${SERVLETPATH_DATA}/?_passreset${param}`;
         let response;
         try {
@@ -2987,7 +3017,7 @@ class VtecxNext {
         //console.log('[vtecxnext userstatus] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_DATA}/?_userstatus${account ? '=' + account : ''}`;
+        const url = `${SERVLETPATH_DATA}/?_userstatus${account ? '=' + encodeURIComponent(account) : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -3019,7 +3049,7 @@ class VtecxNext {
         checkNotNull(account, 'account');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_revokeuser=${account}${isDeleteGroups ? '&_deletegroup=true' : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_revokeuser=${encodeURIComponent(account)}${isDeleteGroups ? '&_deletegroup=true' : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -3089,7 +3119,7 @@ class VtecxNext {
         checkNotNull(account, 'account');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_PROVIDER}/?_activateuser=${account}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_activateuser=${encodeURIComponent(account)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -3183,7 +3213,7 @@ class VtecxNext {
         checkNotNull(account, 'account');
         // vte.cxへリクエスト
         const method = 'DELETE';
-        const url = `${SERVLETPATH_DATA}/?_deleteuser=${account}`;
+        const url = `${SERVLETPATH_DATA}/?_deleteuser=${encodeURIComponent(account)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -3512,7 +3542,7 @@ class VtecxNext {
         checkUri(parenturi);
         // vte.cxへリクエスト
         const method = 'POST';
-        const url = `${SERVLETPATH_PROVIDER}${parenturi}?_content${extension ? '&_ext=' + extension : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}${parenturi}?_content${extension ? '&_ext=' + encodeURIComponent(extension) : ''}`;
         //console.log(`[vtecxnext postcontent] request. url=${url}`)
         const headers = { 'Content-Type': this.req?.headers.get('content-type') };
         if (filename) {
@@ -3655,7 +3685,7 @@ class VtecxNext {
         checkUri(parenturi);
         // vte.cxへリクエスト
         const method = 'POST';
-        const url = `${SERVLETPATH_PROVIDER}${parenturi}?_content&_signedurl${extension ? '&_ext=' + extension : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}${parenturi}?_content&_signedurl${extension ? '&_ext=' + encodeURIComponent(extension) : ''}`;
         //console.log(`[vtecxnext getSignedUrlToPostContent] request. url=${url}`)
         const headers = { 'Content-Type': this.req?.headers?.get('content-type') };
         if (filename) {
@@ -3835,13 +3865,14 @@ class VtecxNext {
         return await getJson(response);
     };
     /**
+     * @deprecated
      * Merge an existing user with an line oauth user.
-     * @param rxid RXID
+     * @param wsseApikey WSSE-APIKEY
      * @return user entry
      */
-    mergeOAuthUserLine = async (rxid) => {
-        //console.log(`[vtecxnext mergeOAuthUserLine] start. feed=${feed}`)
-        return this.mergeOAuthUser('line', rxid);
+    mergeOAuthUserLine = async (wsseApikey) => {
+        //console.log(`[vtecxnext mergeOAuthUserLine] start.`)
+        return this.mergeOAuthUser('line', wsseApikey);
     };
     /**
      * create group admin
@@ -3928,7 +3959,7 @@ class VtecxNext {
         checkNotNull(name, 'Name');
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = `${SERVLETPATH_PROVIDER}/?_property=${name}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_property=${encodeURIComponent(name)}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -4368,7 +4399,7 @@ class VtecxNext {
         // 認可リクエストリダイレクトURL生成
         //console.log(`[vtecxnext oauth] redirect_uri=${redirect_uri}`)
         //console.log(`[vtecxnext oauth] origin=${origin}`)
-        const authorizationUrl = `${oauthUrl}?response_type=code&client_id=${client_id}&redirect_uri=${encodeURI(redirect_uri)}&state=${state}&scope=profile`;
+        const authorizationUrl = `${oauthUrl}?response_type=code&client_id=${client_id}&redirect_uri=${encodeURIComponent(redirect_uri)}&state=${state}&scope=profile`;
         //console.log(`[vtecxnext oauth] authorizationUrl=${authorizationUrl}`)
         //res.setHeader('Location', authorizationUrl)
         this.setResponseHeader('Location', authorizationUrl);
@@ -4533,7 +4564,7 @@ class VtecxNext {
         //console.log(`[vtecxnext oauthLink] start. userInfo=${JSON.stringify(userInfo)}`)
         // OAuthリンク・ログイン
         // reCAPTCHA tokenは任意
-        //const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : ''
+        //const param = reCaptchaToken ? `&g-recaptcha-token=${encodeURIComponent(reCaptchaToken)}` : ''
         const param = '';
         const method = 'POST';
         const url = `${SERVLETPATH_OAUTH}/${provider}/link?state=${userInfo.state}${param}`;
@@ -4560,20 +4591,21 @@ class VtecxNext {
         return isLoggedin;
     };
     /**
+     * @deprecated
      * Merge an existing user with an oauth user.
      * @param provider OAuth provider name
-     * @param rxid RXID
+     * @param wsseApikey WSSE-APIKEY
      * @return user entry
      */
-    mergeOAuthUser = async (provider, rxid) => {
-        //console.log(`[vtecxnext mergeOAuthUser] start. feed=${feed}`)
+    mergeOAuthUser = async (provider, wsseApikey) => {
+        //console.log(`[vtecxnext mergeOAuthUser] start. provider=${provider}`)
         // 入力チェック
         checkNotNull(provider, 'Provider');
-        checkNotNull(rxid, 'RXID');
+        checkNotNull(wsseApikey, 'WSSE-APIKEY');
         // vte.cxへリクエスト
         const method = 'PUT';
         const url = `${SERVLETPATH_DATA}/?_mergeoauthuser`;
-        const feed = { feed: { subtitle: provider, rights: rxid } };
+        const feed = { feed: { subtitle: provider, rights: wsseApikey } };
         let response;
         try {
             response = await this.requestVtecx(method, url, JSON.stringify(feed));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [
@@ -17,16 +17,18 @@
     "url": "https://github.com/reflexworks/vtecxnext/issues"
   },
   "homepage": "https://github.com/reflexworks/vtecxnext#readme",
+  "dependencies": {
+    "sqlstring": "^2.3.3"
+  },
+  "peerDependencies": {
+    "next": "^16.0.0"
+  },
   "devDependencies": {
     "@types/node": "^25.9.1",
     "@types/sqlstring": "^2.3.2",
     "ts-node": "^10.9.2",
     "typescript": "^6.0.3"
   },
-  "dependencies": {
-    "next": "^16.2.7",
-    "sqlstring": "^2.3.3"
-  },
   "scripts": {
     "build": "tsc"
   }