w-converhp 2.0.2 → 2.0.3

package/docs/WConverhpServer.mjs.html

@@ -380,14 +380,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'main', token, headers, query })
+                let m = funCheck({ apiType: 'main', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -538,14 +538,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'slice', token, headers, query })
+                let m = funCheck({ apiType: 'slice', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -684,14 +684,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'merge', token, headers, query })
+                let m = funCheck({ apiType: 'merge', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -911,7 +911,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 30 2025 19:42:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 30 2025 20:22:48 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 30 2025 19:42:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 30 2025 20:22:48 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-converhp",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/src/WConverhpClient.mjs

@@ -29,6 +29,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  * @param {String} [opt.url='http://localhost:8080'] 輸入Hapi伺服器網址，預設為'http://localhost:8080'
  * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {Function} [opt.getToken=()=>''] 輸入取得使用者token的回調函數，預設()=>''
+ * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Integer} [opt.retry=3] 輸入傳輸失敗重試次數整數，預設為3
  * @returns {Object} 回傳事件物件，可使用函數execute、upload
@@ -161,6 +162,12 @@ function WConverhpClient(opt) {
         }
     }
 
+    //tokenType
+    let tokenType = get(opt, 'tokenType')
+    if (!isestr(tokenType)) {
+        tokenType = 'Bearer'
+    }
+
     //sizeSlice
     let sizeSlice = get(opt, 'sizeSlice')
     if (!ispint(sizeSlice)) {
@@ -336,7 +343,7 @@ function WConverhpClient(opt) {
             url: urlUse,
             data: dd,
             headers: {
-                Authorization: `Bearer ${token}`,
+                Authorization: `${tokenType} ${token}`,
                 ...ct,
                 ...headers,
             },

package/src/WConverhpServer.mjs

@@ -333,14 +333,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'main', token, headers, query })
+                let m = funCheck({ apiType: 'main', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -491,14 +491,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'slice', token, headers, query })
+                let m = funCheck({ apiType: 'slice', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -637,14 +637,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'merge', token, headers, query })
+                let m = funCheck({ apiType: 'merge', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }

package/srv.mjs

@@ -6,8 +6,8 @@ let opt = {
     port: 8080,
     apiName: 'api',
     pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-    funCheck: ({ apiType, token, headers, query }) => {
-        console.log('funCheck', apiType, token)
+    funCheck: ({ apiType, authorization, headers, query }) => {
+        console.log('funCheck', `apiType[${apiType}]`, `authorization[${authorization}]`)
         return true
     },
 }