w-web-sso 1.0.13 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. package/db/wsso/ips/data.mdb +0 -0
  2. package/db/wsso/ips/lock.mdb +0 -0
  3. package/db/wsso/tokens/data.mdb +0 -0
  4. package/db/wsso/tokens/lock.mdb +0 -0
  5. package/db/wsso/users/data.mdb +0 -0
  6. package/db/wsso/users/lock.mdb +0 -0
  7. package/dist/css/{app.03a2f95c.css → app.e4367a2b.css} +1 -1
  8. package/dist/index.tmp +6 -2
  9. package/dist/js/app-legacy.4ebeee34.js +2 -0
  10. package/dist/js/app-legacy.4ebeee34.js.map +1 -0
  11. package/dist/js/app.d1707f92.js +2 -0
  12. package/dist/js/app.d1707f92.js.map +1 -0
  13. package/dist/js/chunk-vendors-legacy.7380957a.js +15 -0
  14. package/dist/js/chunk-vendors-legacy.7380957a.js.map +1 -0
  15. package/dist/js/chunk-vendors.7380957a.js +15 -0
  16. package/dist/js/chunk-vendors.7380957a.js.map +1 -0
  17. package/dist/w-web-sso.umd.js +2 -2
  18. package/dist/w-web-sso.umd.js.map +1 -1
  19. package/docs/WWebSso.html +4 -112
  20. package/docs/WWebSso.mjs.html +460 -111
  21. package/docs/index.html +1 -1
  22. package/g.getSettings.mjs +0 -1
  23. package/g.initialData.mjs +8 -10
  24. package/g.mjs +0 -0
  25. package/package.json +7 -6
  26. package/public/index.html +13 -0
  27. package/server/WWebSso.mjs +459 -110
  28. package/server/procCore.mjs +871 -277
  29. package/server/procProtect.mjs +746 -0
  30. package/server/procStaInfor.mjs +393 -0
  31. package/server/provideUsers.mjs +0 -1
  32. package/server/srlog.mjs +12 -0
  33. package/server/staLogs/staIp.callWorker.mjs +35 -0
  34. package/server/staLogs/staIp.mjs +118 -0
  35. package/server/staLogs/staIp.shellWorker.mjs +18 -0
  36. package/server/staLogs/staToken.callWorker.mjs +35 -0
  37. package/server/staLogs/staToken.mjs +118 -0
  38. package/server/staLogs/staToken.shellWorker.mjs +18 -0
  39. package/server/staLogs/staUserAccountLogin.callWorker.mjs +35 -0
  40. package/server/staLogs/staUserAccountLogin.mjs +136 -0
  41. package/server/staLogs/staUserAccountLogin.shellWorker.mjs +18 -0
  42. package/server/staLogs/test_staIp.mjs +27 -0
  43. package/server/staLogs/test_staToken.mjs +27 -0
  44. package/server/staLogs/test_staUserAccountLogin.mjs +30 -0
  45. package/settings.json +15 -1
  46. package/src/components/Layout.vue +70 -15
  47. package/src/components/LayoutContent.vue +35 -33
  48. package/src/components/LayoutContentIps.vue +757 -0
  49. package/src/components/LayoutContentStaInfor.vue +917 -0
  50. package/src/components/LayoutContentTokens.vue +961 -0
  51. package/src/components/{LayoutContentInfor.vue → LayoutContentUserInfor.vue} +366 -73
  52. package/src/components/LayoutContentUsers.vue +21 -34
  53. package/src/components/PageLogin.vue +1 -1
  54. package/src/components/VeUser.vue.txt +9 -10
  55. package/src/components/ruleGroup.vue.txt +5 -6
  56. package/src/main.js +7 -13
  57. package/src/plugins/mLang.mjs +853 -520
  58. package/src/plugins/mShare.mjs +141 -3
  59. package/src/plugins/mUI.mjs +30 -21
  60. package/src/schema/index.mjs +2 -0
  61. package/src/schema/tables/ips.mjs +0 -9
  62. package/src/schema/tables/tokens.mjs +5 -1
  63. package/src/schema/tables/users.mjs +2 -14
  64. package/src/store/mutations.mjs +3 -3
  65. package/src/store/types.mjs +1 -1
  66. package/srv.mjs +55 -38
  67. package/_/350/246/217/345/212/203.md +0 -275
  68. package/dist/js/app-legacy.d468ef7f.js +0 -2
  69. package/dist/js/app-legacy.d468ef7f.js.map +0 -1
  70. package/dist/js/app.d468ef7f.js +0 -2
  71. package/dist/js/app.d468ef7f.js.map +0 -1
  72. package/dist/js/chunk-vendors-legacy.f51f58bb.js +0 -13
  73. package/dist/js/chunk-vendors-legacy.f51f58bb.js.map +0 -1
  74. package/dist/js/chunk-vendors.f51f58bb.js +0 -13
  75. package/dist/js/chunk-vendors.f51f58bb.js.map +0 -1
  76. package/src/components/LayoutContentSettings.vue +0 -1248
@@ -53,6 +53,7 @@ import isestr from 'wsemi/src/isestr.mjs'
53
53
  import ispint from 'wsemi/src/ispint.mjs'
54
54
  import isearr from 'wsemi/src/isearr.mjs'
55
55
  import ispnum from 'wsemi/src/ispnum.mjs'
56
+ import isErr from 'wsemi/src/isErr.mjs'
56
57
  import isfun from 'wsemi/src/isfun.mjs'
57
58
  import cint from 'wsemi/src/cint.mjs'
58
59
  import strleft from 'wsemi/src/strleft.mjs'
@@ -65,7 +66,11 @@ import replace from 'wsemi/src/replace.mjs'
65
66
  import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
66
67
  import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
67
68
  import ds from '../src/schema/index.mjs'
69
+ import * as s from '../src/plugins/mShare.mjs'
70
+ import srlog from './srlog.mjs'
68
71
  import procCore from './procCore.mjs'
72
+ import procProtect from './procProtect.mjs'
73
+ import procStaInfor from './procStaInfor.mjs'
69
74
  import procSettings from './procSettings.mjs'
70
75
 
71
76
 
@@ -74,11 +79,8 @@ import procSettings from './procSettings.mjs'
74
79
  *
75
80
  * @class
76
81
  * @param {Function} WOrm 輸入資料庫ORM函數
77
- * @param {String} url 輸入資料庫連線字串,例如w-orm-lmdb為'./db',或w-orm-mongodb為'mongodb://sername:password@$127.0.0.1:27017'
82
+ * @param {String} url 輸入資料庫連線字串,例如w-orm-lmdb為'./db',或w-orm-mongodb為'mongodb://username:password@$127.0.0.1:27017'
78
83
  * @param {String} db 輸入資料庫名稱字串
79
- * @param {Function} getUserByToken 輸入處理函數,函數會傳入使用者token,通過此函數處理後並回傳使用者資訊物件,並至少須提供'id'、'email'、'name'、'isAdmin'欄位,且'isAdmin'限輸入'y'或'n',且輸入'y'時會複寫權限系統該使用者之'isAdmin'欄位值
80
- * @param {Function} verifyClientUser 輸入驗證瀏覽使用者身份之處理函數,函數會傳入使用者資訊物件,通過此函數識別後回傳布林值,允許使用者回傳true,反之回傳false
81
- * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數,函數會傳入使用者資訊物件,通過此函數識別後回傳布林值,允許使用者回傳true,反之回傳false
82
84
  * @param {String} [pathSettings='./settings'] 輸入設定檔案路徑字串,預設'./settings'
83
85
  * @returns {Object} 回傳物件,其內server為hapi伺服器實體,wsrv為w-converhp的伺服器事件物件,wsds為w-serv-webdata的伺服器事件物件,可監聽error事件
84
86
  * @example
@@ -86,7 +88,7 @@ import procSettings from './procSettings.mjs'
86
88
  *
87
89
  *
88
90
  */
89
- function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, pathSettings) {
91
+ function WWebSso(WOrm, url, db, pathSettings) {
90
92
  let instWServHapiServer = null
91
93
 
92
94
 
@@ -111,27 +113,6 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
111
113
  }
112
114
 
113
115
 
114
- //check getUserByToken
115
- if (!isfun(getUserByToken)) {
116
- console.log('invalid getUserByToken', getUserByToken)
117
- throw new Error('invalid getUserByToken')
118
- }
119
-
120
-
121
- //check verifyClientUser
122
- if (!isfun(verifyClientUser)) {
123
- console.log('invalid verifyClientUser', verifyClientUser)
124
- throw new Error('invalid verifyClientUser')
125
- }
126
-
127
-
128
- //check verifyAppUser
129
- if (!isfun(verifyAppUser)) {
130
- console.log('invalid verifyAppUser', verifyAppUser)
131
- throw new Error('invalid verifyAppUser')
132
- }
133
-
134
-
135
116
  //check pathSettings
136
117
  if (!fsIsFile(pathSettings)) {
137
118
  pathSettings = './settings.json'
@@ -144,14 +125,29 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
144
125
 
145
126
  //getSettings
146
127
  let opt = procSettings.getSettings()
128
+ // console.log('opt', opt)
147
129
  // * @param {Object|String} [opt={}] 輸入設定物件或設定檔檔案路徑字串,若給予檔案路徑則會預設檔案為json格式且讀入成為opt物件,預設{}
148
- // * @param {Integer} [opt.serverPort=11007] 輸入伺服器通訊port,預設11006
130
+ // * @param {Integer} [opt.serverPort=11007] 輸入伺服器通訊port整數,預設11007
149
131
  // * @param {Boolean} [opt.useCheckUser=false] 輸入是否檢查使用者資訊布林值,預設false
150
132
  // * @param {Function} [opt.getUserById=null] 輸入當useCheckUser=true時依照使用者ID取得使用者資訊物件函數,預設null
151
133
  // * @param {Boolean} [opt.useExcludeWhenNotAdmin=false] 輸入使用ORM的select方法時是否自動刪除數據內isActive欄位之布林值,預設false
152
134
  // * @param {Object} [opt.webName={}] 輸入站台名稱物件,至少包含語系eng與cht鍵的名稱,預設{}
153
135
  // * @param {Object} [opt.webDescription={}] 輸入站台描述物件,至少包含語系eng與cht鍵的名稱,預設{}
154
136
  // * @param {String} [opt.webLogo=''] 輸入站台logo字串,採base64格式,預設''
137
+ // * @param {Array} [opt.webBackgoundGradientColors=['#FFE0B2', '#FFCC80', '#FFF59D', '#F2D6A2', '#F0CC88']] 輸入使用者登入頁顏色陣列,前3色為背景線性linear-gradient,第4色為登入區塊背景色,第5色為站台logo背景色,若不給則預設白色。預設['#FFE0B2', '#FFCC80', '#FFF59D', '#F2D6A2', '#F0CC88']
138
+ // * @param {String} [opt.webKey=''] 輸入站台識別字串,預設''
139
+ // * @param {String} [opt.salt=''] 輸入密碼加鹽字串,預設''
140
+ // * @param {Integer} [opt.minExpired=30] 輸入創建或更新金鑰有效時間整數,單位分鐘(min),預設30
141
+ // * @param {Integer} [opt.minForAccountLoginFailed=10] 輸入限制帳號最大登入失敗(密碼錯誤)次數之判準時間整數,單位分鐘(min),預設10
142
+ // * @param {Integer} [opt.numForAccountLoginFailed=3] 輸入限制帳號最大登入失敗(密碼錯誤)之次數整數,預設3
143
+ // * @param {Integer} [opt.minBlockForAccountLoginFailed=30] 輸入限制帳號最大登入失敗(密碼錯誤)次數之觸發後封鎖時間整數,單位分鐘(min),預設30
144
+ // * @param {Integer} [opt.minForTokenCallApi=10] 輸入限制token最大調用API次數之判準時間整數,單位分鐘(min),預設10
145
+ // * @param {Integer} [opt.numForTokenCallApi=1000] 輸入限制token最大調用API之次數整數,預設1000
146
+ // * @param {Integer} [opt.minBlockForTokenCallApi=30] 輸入限制token最大調用API次數之觸發後封鎖時間整數,單位分鐘(min),預設30
147
+ // * @param {Integer} [opt.minForIpCallApi=10] 輸入限制IP最大調用API次數之判準時間整數,單位分鐘(min),預設10
148
+ // * @param {Integer} [opt.numForIpCallApi=10000] 輸入限制IP最大調用API之次數整數,預設10000
149
+ // * @param {Integer} [opt.minBlockForIpCallApi=30] 輸入限制IP最大調用API次數之觸發後封鎖時間整數,單位分鐘(min),預設30
150
+ // * @param {String} [opt.userLogo=''] 輸入使用者logo字串,採base64格式,預設''
155
151
  // * @param {String} [opt.subfolder=''] 輸入站台所在子目錄字串,提供站台位於內網採反向代理進行服務時,故需支援位於子目錄情形,預設''
156
152
  // * @param {String} [opt.mappingBy='email'] 輸入外部系統識別使用者token後所提供之資料物件,與權限系統之使用者資料物件,兩者間查找之對應欄位,可選'id'、'email'、'name',預設'email'
157
153
 
@@ -191,7 +187,7 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
191
187
  //webBackgoundGradientColors
192
188
  let webBackgoundGradientColors = get(opt, 'webBackgoundGradientColors', [])
193
189
  if (!isearr(webBackgoundGradientColors)) {
194
- webBackgoundGradientColors = ['#FFE0B2', '#FFCC80', '#FFF59D']
190
+ webBackgoundGradientColors = ['#FFE0B2', '#FFCC80', '#FFF59D', '#F2D6A2', '#F0CC88']
195
191
  }
196
192
 
197
193
 
@@ -203,12 +199,84 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
203
199
  let salt = get(opt, 'salt', '')
204
200
 
205
201
 
206
- //timeExpired
207
- let timeExpired = get(opt, 'timeExpired', '')
208
- if (ispnum(timeExpired)) {
209
- timeExpired = 30
202
+ //minExpired, 使用者成功登入後產生token之有效時間(分鐘)
203
+ let minExpired = get(opt, 'minExpired', '')
204
+ if (!ispnum(minExpired)) {
205
+ minExpired = 30
206
+ }
207
+
208
+
209
+ //minForAccountLoginFailed, 限制帳號最大登入失敗(密碼錯誤)次數之判準時間(分鐘)
210
+ let minForAccountLoginFailed = get(opt, 'minForAccountLoginFailed', '')
211
+ if (!ispnum(minForAccountLoginFailed)) {
212
+ minForAccountLoginFailed = 10
213
+ }
214
+
215
+
216
+ //numForAccountLoginFailed, 限制帳號最大登入失敗(密碼錯誤)之次數
217
+ let numForAccountLoginFailed = get(opt, 'numForAccountLoginFailed', '')
218
+ if (!ispnum(numForAccountLoginFailed)) {
219
+ numForAccountLoginFailed = 3
220
+ }
221
+
222
+
223
+ //minBlockForAccountLoginFailed, 限制帳號最大登入失敗(密碼錯誤)次數之觸發後封鎖時間(分鐘)
224
+ let minBlockForAccountLoginFailed = get(opt, 'minBlockForAccountLoginFailed', '')
225
+ if (!ispnum(minBlockForAccountLoginFailed)) {
226
+ minBlockForAccountLoginFailed = 30
227
+ }
228
+
229
+
230
+ //minForTokenCallApi, 限制token最大調用API次數之判準時間(分鐘)
231
+ let minForTokenCallApi = get(opt, 'minForTokenCallApi', '')
232
+ if (!ispnum(minForTokenCallApi)) {
233
+ minForTokenCallApi = 10
234
+ }
235
+
236
+
237
+ //numForTokenCallApi, 限制token最大調用API之次數
238
+ let numForTokenCallApi = get(opt, 'numForTokenCallApi', '')
239
+ if (!ispnum(numForTokenCallApi)) {
240
+ numForTokenCallApi = 1000
241
+ }
242
+
243
+
244
+ //minBlockForTokenCallApi, 限制token最大調用API次數之觸發後封鎖時間(分鐘)
245
+ let minBlockForTokenCallApi = get(opt, 'minBlockForTokenCallApi', '')
246
+ if (!ispnum(minBlockForTokenCallApi)) {
247
+ minBlockForTokenCallApi = 30
248
+ }
249
+
250
+
251
+ //minForIpCallApi, 限制IP最大調用API次數之判準時間(分鐘)
252
+ let minForIpCallApi = get(opt, 'minForIpCallApi', '')
253
+ if (!ispnum(minForIpCallApi)) {
254
+ minForIpCallApi = 10
210
255
  }
211
256
 
257
+
258
+ //numForIpCallApi, 限制IP最大調用API之次數
259
+ let numForIpCallApi = get(opt, 'numForIpCallApi', '')
260
+ if (!ispnum(numForIpCallApi)) {
261
+ numForIpCallApi = 10000
262
+ }
263
+
264
+
265
+ //minBlockForIpCallApi, 限制IP最大調用API次數之觸發後封鎖時間(分鐘)
266
+ let minBlockForIpCallApi = get(opt, 'minBlockForIpCallApi', '')
267
+ if (!ispnum(minBlockForIpCallApi)) {
268
+ minBlockForIpCallApi = 30
269
+ }
270
+
271
+
272
+ //是否啟用要求使用者定期更換密碼
273
+ // 若是,預設6個月更換密碼,是否允許使用同樣密碼
274
+
275
+
276
+ //userLogo
277
+ let userLogo = get(opt, 'userLogo', '')
278
+
279
+
212
280
  //subfolder
213
281
  let subfolder = get(opt, 'subfolder', '')
214
282
  if (isestr(subfolder)) {
@@ -226,19 +294,14 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
226
294
  let language = get(opt, 'language', 'eng')
227
295
  let showModeEditUsers = get(opt, 'showModeEditUsers', 'n')
228
296
  let modeEditUsers = get(opt, 'modeEditUsers', 'n')
297
+ let showModeEditTokens = get(opt, 'showModeEditTokens', 'n')
298
+ let modeEditTokens = get(opt, 'modeEditTokens', 'n')
299
+ let showModeEditIps = get(opt, 'showModeEditIps', 'n')
300
+ let modeEditIps = get(opt, 'modeEditIps', 'n')
229
301
 
230
- //是否可於登入頁提供申請註冊使用者按鈕 bbb
302
+ //是否可於登入頁提供申請註冊使用者按鈕
231
303
  //是否使用圖形驗證碼模組
232
304
 
233
- // - 使用者成功登入後產生token之有效(過期)時間m(30)分鐘
234
- // - 使用者n(10)分鐘內最大登入失敗次數m(3),若觸發則進入封鎖狀態p(30)分鐘
235
- // - 使用者n(10)分鐘內最大調用API次數m(1000),若觸發則進入封鎖狀態p(30)分鐘
236
- // - IP使用者n(10)分鐘內最大調用API次數m(10000),若觸發則IP進入封鎖狀態p(30)分鐘
237
- // - 清除(移動至備份表)紀錄使用者與IP連線log機制,偵測時間n(1)天,保留最新資料時間m(60)天
238
-
239
- //是否啟用要求使用者定期更換密碼
240
- // 若是,預設6個月更換密碼,是否允許使用同樣密碼
241
-
242
305
  //email模板
243
306
  // 註冊驗證信模板
244
307
  // 變更使用者密碼驗證信模板
@@ -276,7 +339,7 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
276
339
 
277
340
 
278
341
  //getWebInfor
279
- let getWebInfor = (_t) => {
342
+ let getWebInfor = () => {
280
343
  return {
281
344
 
282
345
  webName,
@@ -284,12 +347,17 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
284
347
  webLogo,
285
348
  webBackgoundGradientColors,
286
349
  webKey,
350
+ userLogo,
287
351
 
288
352
  showLanguage,
289
353
  language,
290
354
 
291
355
  showModeEditUsers,
292
356
  modeEditUsers,
357
+ showModeEditTokens,
358
+ modeEditTokens,
359
+ showModeEditIps,
360
+ modeEditIps,
293
361
 
294
362
  kpLangExt,
295
363
 
@@ -297,22 +365,21 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
297
365
  }
298
366
 
299
367
 
300
- //procCore
301
- let p = procCore(woItems, procOrm, { salt, timeExpired })
302
-
303
-
304
- //detect
305
- let stCleanTokens = 'none'
306
- setInterval(() => {
307
- if (stCleanTokens === 'doing') {
308
- return
309
- }
310
- stCleanTokens = 'doing'
311
- p.cleanTokens()
312
- .finally(() => {
313
- stCleanTokens = 'none'
314
- })
315
- }, 1000)
368
+ //procCore, procProtect, procStaInfor
369
+ let p = procCore(woItems, procOrm, { salt, minExpired })
370
+ let pp = procProtect(woItems, p, {
371
+ minForAccountLoginFailed,
372
+ numForAccountLoginFailed,
373
+ minBlockForAccountLoginFailed,
374
+ minForTokenCallApi,
375
+ numForTokenCallApi,
376
+ minBlockForTokenCallApi,
377
+ minForIpCallApi,
378
+ numForIpCallApi,
379
+ minBlockForIpCallApi,
380
+ })
381
+ let pf = procStaInfor(woItems, p, {
382
+ })
316
383
 
317
384
 
318
385
  // //parseToken
@@ -551,6 +618,20 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
551
618
  // }
552
619
 
553
620
 
621
+ //funCheckAdmin
622
+ let funCheckAdmin = (tk, u) => {
623
+ // console.log('tk', tk, 'u', u)
624
+ let b1 = s.getIsVerified(u)
625
+ let b2 = !s.getIsExpired(u) //不能過期
626
+ let b3 = !s.getIsBlocked(u) //不能封鎖中
627
+ let b4 = s.getIsAdmin(u)
628
+ let b5 = s.getIsActive(u)
629
+ let b = b1 && b2 && b3 && b4 && b5
630
+ // console.log('fun', 'tk', tk, 'u', u, b)
631
+ return b
632
+ }
633
+
634
+
554
635
  //pathStaticFiles
555
636
  let pathStaticFiles = 'dist'
556
637
  let npmPathStaticFiles = './node_modules/w-web-sso/dist'
@@ -599,14 +680,6 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
599
680
  // },
600
681
  // },
601
682
 
602
- // {
603
- // method: 'GET',
604
- // path: '/getWebInfor',
605
- // handler: async function (req, res) {
606
- // return getWebInfor() //bbb 應該已不用, 前端載入通訊器後由$fapi.getWebInfor呼叫
607
- // },
608
- // },
609
-
610
683
  {
611
684
  method: 'GET',
612
685
  path: '/api/logoutSsoUser',
@@ -619,8 +692,11 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
619
692
  let token = get(req, 'query.token', '')
620
693
  // console.log('token', token)
621
694
 
622
- //logOutByToken
623
- let b = await p.logOutByToken(token)
695
+ //info
696
+ srlog.info({ event: 'api/logoutSsoUser', token })
697
+
698
+ //logoutByToken
699
+ let b = await p.logoutByToken(token)
624
700
  // console.log('b', b)
625
701
 
626
702
  return b
@@ -628,6 +704,9 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
628
704
 
629
705
  //pm2resolve core
630
706
  let r = await pm2resolve(core)()
707
+ if (isErr(r.msg)) {
708
+ r.msg = r.msg.message
709
+ }
631
710
  // console.log('logoutSsoUser', r)
632
711
 
633
712
  return r
@@ -646,6 +725,12 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
646
725
  let token = get(req, 'query.token', '')
647
726
  // console.log('token', token)
648
727
 
728
+ //info
729
+ srlog.info({ event: 'api/checkToken', token })
730
+
731
+ //callApiByToken
732
+ pp.callApiByToken(token)
733
+
649
734
  //checkToken
650
735
  let b = await p.checkToken(token)
651
736
  // console.log('b', b)
@@ -655,12 +740,87 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
655
740
 
656
741
  //pm2resolve core
657
742
  let r = await pm2resolve(core)()
743
+ if (isErr(r.msg)) {
744
+ r.msg = r.msg.message
745
+ }
658
746
  // console.log('checkToken', r)
659
747
 
660
748
  return r
661
749
  },
662
750
  },
663
751
 
752
+ {
753
+ method: 'GET',
754
+ path: '/api/refreshToken',
755
+ handler: async function (req, res) {
756
+ // console.log('refreshToken', req)
757
+
758
+ async function core() {
759
+
760
+ //token
761
+ let token = get(req, 'query.token', '')
762
+ // console.log('token', token)
763
+
764
+ //info
765
+ srlog.info({ event: 'api/refreshToken', token })
766
+
767
+ //callApiByToken
768
+ pp.callApiByToken(token)
769
+
770
+ //refreshToken
771
+ let b = await p.refreshToken(token)
772
+ // console.log('b', b)
773
+
774
+ return b
775
+ }
776
+
777
+ //pm2resolve core
778
+ let r = await pm2resolve(core)()
779
+ if (isErr(r.msg)) {
780
+ r.msg = r.msg.message
781
+ }
782
+ // console.log('refreshToken', r)
783
+
784
+ return r
785
+ },
786
+ },
787
+
788
+ {
789
+ method: 'GET',
790
+ path: '/api/logoutByToken',
791
+ handler: async function (req, res) {
792
+ // console.log('logoutByToken', req)
793
+
794
+ async function core() {
795
+
796
+ //token
797
+ let token = get(req, 'query.token', '')
798
+ // console.log('token', token)
799
+
800
+ //info
801
+ srlog.info({ event: 'api/logoutByToken', token })
802
+
803
+ //callApiByToken
804
+ pp.callApiByToken(token)
805
+
806
+ //logoutByToken
807
+ let b = await p.logoutByToken(token)
808
+ // console.log('b', b)
809
+
810
+ return b
811
+ }
812
+
813
+ //pm2resolve core
814
+ let r = await pm2resolve(core)()
815
+ if (isErr(r.msg)) {
816
+ r.msg = r.msg.message
817
+ }
818
+ // console.log('logoutByToken', r)
819
+
820
+ return r
821
+ },
822
+ },
823
+
664
824
  {
665
825
  method: 'GET',
666
826
  path: '/api/getSsoUsersList',
@@ -673,8 +833,14 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
673
833
  let token = get(req, 'query.token', '')
674
834
  // console.log('token', token)
675
835
 
676
- //getUsersList
677
- let us = await p.getUsersList(token)
836
+ //info
837
+ srlog.info({ event: 'api/getSsoUsersList', token })
838
+
839
+ //callApiByToken
840
+ pp.callApiByToken(token)
841
+
842
+ //checkTokenAndGetUsersList
843
+ let us = await p.checkTokenAndGetUsersList(token)
678
844
  // console.log('us', us)
679
845
 
680
846
  return us
@@ -682,6 +848,9 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
682
848
 
683
849
  //pm2resolve core
684
850
  let r = await pm2resolve(core)()
851
+ if (isErr(r.msg)) {
852
+ r.msg = r.msg.message
853
+ }
685
854
  // console.log('getSsoUsersList', r)
686
855
 
687
856
  return r
@@ -708,15 +877,21 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
708
877
  let value = get(req, 'query.value', '')
709
878
  // console.log('value', value)
710
879
 
880
+ //info
881
+ srlog.info({ event: 'api/getSsoUserInfor', token, key, value })
882
+
883
+ //callApiByToken
884
+ pp.callApiByToken(token)
885
+
711
886
  //userTarget
712
887
  let userTarget = null
713
888
  if (key === 'token') {
714
- userTarget = await p.getUserByToken(value)
715
- // console.log('getUserByToken userTarget', userTarget)
889
+ userTarget = await p.checkTokenAndGetUserByToken(token, value)
890
+ // console.log('checkTokenAndGetUserByToken userTarget', userTarget)
716
891
  }
717
892
  else {
718
- userTarget = await p.getUserInfor(token, key, value)
719
- // console.log('getUserInfor userTarget', userTarget)
893
+ userTarget = await p.checkTokenAndGetUserInfor(token, key, value)
894
+ // console.log('checkTokenAndGetUserInfor userTarget', userTarget)
720
895
  }
721
896
 
722
897
  //check
@@ -732,6 +907,9 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
732
907
 
733
908
  //pm2resolve core
734
909
  let r = await pm2resolve(core)()
910
+ if (isErr(r.msg)) {
911
+ r.msg = r.msg.message
912
+ }
735
913
  // console.log('getSsoUserInfor', r)
736
914
 
737
915
  return r
@@ -741,24 +919,65 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
741
919
  ]
742
920
 
743
921
 
744
- // //tableNamesExec, tableNamesSync
745
- // let tableNamesExec = [] //keys(ds)
746
- // // let tableNamesSync = filter(tableNamesExec, (v) => {
747
- // // return strright(v, 5) !== 'Items'//不同步數據
748
- // // })
749
- // let tableNamesSync = []
750
-
751
-
752
922
  //WServHapiServer
753
923
  instWServHapiServer = new WServHapiServer({
754
924
  port: opt.serverPort,
755
925
  pathStaticFiles,
926
+ apiName: 'api',
756
927
  apis,
757
- verifyConn: () => {
758
- return true
928
+ tokenType: 'Bearer',
929
+ verifyConn: async ({ apiType, authorization, headers, query }) => {
930
+ // console.log('headers', headers)
931
+
932
+ //getIpByHeaders
933
+ let ip = pp.getIpByHeaders(headers)
934
+ // console.log('ip', ip)
935
+
936
+ //origin
937
+ let origin = get(headers, 'origin', '')
938
+
939
+ //referer
940
+ let referer = get(headers, 'referer', '')
941
+
942
+ //info
943
+ srlog.info({ event: 'verifyConn', ip, origin, referer })
944
+
945
+ //callApiByIp
946
+ pp.callApiByIp(ip)
947
+
948
+ //getBlockedByIp
949
+ let b = true
950
+ await pp.getBlockedByIp(ip)
951
+ .then((res) => {
952
+ // console.log('pp.getBlockedByIp(ip) then', res)
953
+ b = res
954
+ })
955
+ .catch(() => {
956
+ // console.log('pp.getBlockedByIp(ip) catch', err)
957
+ b = true
958
+ })
959
+ // console.log('pp.getBlockedByIp(ip)', b)
960
+
961
+ //b改為代表通行(未封鎖)狀態
962
+ b = !b
963
+
964
+ // //getInforsByIpCallApi
965
+ // let rs = await pp.getInforsByIpCallApi(ip)
966
+ // console.log('getInforsByIpCallApi', [
967
+ // rs[0],
968
+ // rs[rs.length - 1],
969
+ // ], rs.length)
970
+
971
+ //logshow
972
+ if (!b) {
973
+ console.log(`block ip[${ip}]`) //[tag:測試:顯示被封鎖ip]
974
+ }
975
+ // b = true //強制通行
976
+
977
+ return b
759
978
  },
760
979
  getUserIdByToken: async (token) => { //可使用async或sync函數
761
- return ''
980
+ return '' //不檢核, 查找與變更數據皆由kpFunExt內各函數各自檢核
762
981
  },
763
982
  corsOrigins: ['*'],
764
983
  useDbOrm: false,
@@ -768,43 +987,173 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
768
987
  methodsExec: [], //['select', 'insert', 'save', 'del', 'delAll'],
769
988
  tableNamesSync: [],
770
989
  kpFunExt: { //接收參數第1個為userId, 之後才是前端給予參數
771
- getWebInfor,
772
- getUserByToken: (_t, token) => {
773
- return p.getUserByToken(token)
990
+
991
+ getWebInfor: async (_t) => {
992
+ return getWebInfor()
774
993
  },
775
- loginByAccountAndPassword: (_t, account, password) => {
776
- return p.loginByAccountAndPassword(account, password)
994
+
995
+ checkToken: async(_t, token) => { //sso前端通過$fapi.checkToken調用
996
+ srlog.info({ event: 'kpfun-checkToken', token })
997
+ let r = await p.checkToken(token)
998
+ return r
777
999
  },
778
- checkToken: (_t, token) => {
779
- return p.checkToken(token)
1000
+ refreshToken: async(_t, token) => { //sso前端通過$fapi.refreshToken調用
1001
+ srlog.info({ event: 'kpfun-refreshToken', token })
1002
+ let r = await p.refreshToken(token)
1003
+ return r
780
1004
  },
781
- refreshToken: (_t, token) => {
782
- return p.refreshToken(token)
1005
+ loginByAccountAndPassword: async (_t, account, password) => {
1006
+
1007
+ //info, 使用者登入前
1008
+ srlog.info({ event: 'kpfun-loginByAccountAndPassword-before', account })
1009
+
1010
+ let u = null
1011
+ let msg = ''
1012
+ await pp.loginByAccountAndPassword(account, password) //記得不能使用p.loginByAccountAndPassword, 此未提供保護機制
1013
+ .then((res) => {
1014
+ u = res
1015
+ })
1016
+ .catch((err) => {
1017
+ msg = err
1018
+ })
1019
+
1020
+ //info, 使用者登入成功或失敗
1021
+ if (iseobj(u)) {
1022
+ srlog.info({ event: 'kpfun-loginByAccountAndPassword-success', account })
1023
+ }
1024
+ else {
1025
+ srlog.info({ event: 'kpfun-loginByAccountAndPassword-error', account, msg })
1026
+ }
1027
+
1028
+ if (iseobj(u)) {
1029
+ return u
1030
+ }
1031
+ return Promise.reject(msg)
783
1032
  },
784
- logOutByToken: (_t, token) => {
785
- return p.logOutByToken(token)
1033
+ logoutByToken: async (_t, token) => {
1034
+ srlog.info({ event: 'kpfun-logoutByToken', token })
1035
+ let r = await p.logoutByToken(token)
1036
+ return r
786
1037
  },
787
- getUsersList: (_t, token) => {
788
- return p.getUsersList(token)
1038
+ getUserByToken: async (_t, token) => {
1039
+ srlog.info({ event: 'kpfun-getUserByToken', token })
1040
+ //console.log('call getUserByToken...')
1041
+ let r = await p.checkTokenAndGetUserByToken(token, token)
1042
+ //console.log('call getUserByToken end')
1043
+ return r
789
1044
  },
790
- updateUsersList: (_t, token, rows) => {
791
- return p.updateUsersList(token, rows)
1045
+ getUserInfor: async (_t, token, key, value) => {
1046
+ srlog.info({ event: 'kpfun-getUserInfor', token, key, value })
1047
+ //console.log('call getUserInfor...')
1048
+ let r = await p.checkTokenAndGetUserInfor(token, key, value)
1049
+ //console.log('call getUserInfor end')
1050
+ return r
792
1051
  },
793
- getSettings: async (_t, token,) => {
794
1052
 
795
- //checkToken
796
- await p.checkToken(token)
1053
+ getUsersList: async (_t, token) => {
1054
+ srlog.info({ event: 'kpfun-getUsersList', token })
1055
+ //console.log('call getUsersList...')
1056
+ let rs = await p.checkTokenAndGetUsersList(token, { fun: funCheckAdmin })
1057
+ //console.log('call getUsersList end')
1058
+ return rs
1059
+ },
1060
+ updateUsersList: async (_t, token, rows) => {
1061
+ srlog.info({ event: 'kpfun-updateUsersList', token })
1062
+ //console.log('call updateUsersList...')
1063
+ let rs = await p.checkTokenAndUpdateUsersList(token, rows, { fun: funCheckAdmin })
1064
+ //console.log('call updateUsersList end')
1065
+ return rs
1066
+ },
797
1067
 
798
- return procSettings.getSettings()
1068
+ getTokensList: async (_t, token) => {
1069
+ srlog.info({ event: 'kpfun-getTokensList', token })
1070
+ //console.log('call getTokensList...')
1071
+ let rs = await p.checkTokenAndGetTokensList(token, { fun: funCheckAdmin })
1072
+ //console.log('call getTokensList end')
1073
+ return rs
1074
+ },
1075
+ updateTokensList: async (_t, token, rows) => {
1076
+ srlog.info({ event: 'kpfun-updateTokensList', token })
1077
+ //console.log('call updateTokensList...')
1078
+ let rs = await p.checkTokenAndUpdateTokensList(token, rows, { fun: funCheckAdmin })
1079
+ //console.log('call updateTokensList end')
1080
+ return rs
799
1081
  },
800
- updateSettings: async (_t, token, st) => {
801
1082
 
802
- //checkToken
803
- await p.checkToken(token)
1083
+ getIpsList: async (_t, token) => {
1084
+ srlog.info({ event: 'kpfun-getIpsList', token })
1085
+ //console.log('call getIpsList...')
1086
+ let rs = await p.checkTokenAndGetIpsList(token, { fun: funCheckAdmin })
1087
+ //console.log('call getIpsList end')
1088
+ return rs
1089
+ },
1090
+ updateIpsList: async (_t, token, rows) => {
1091
+ srlog.info({ event: 'kpfun-updateIpsList', token })
1092
+ //console.log('call updateIpsList...')
1093
+ let rs = await p.checkTokenAndUpdateIpsList(token, rows, { fun: funCheckAdmin })
1094
+ //console.log('call updateIpsList end')
1095
+ return rs
1096
+ },
1097
+
1098
+ getStaUserSummary: async (_t, token) => {
1099
+ srlog.info({ event: 'kpfun-getStaUserSummary', token })
1100
+ //console.log('call getStaUserSummary...')
1101
+ let r = await pf.getStaUserSummary(token, { fun: funCheckAdmin })
1102
+ //console.log('call getStaUserSummary end')
1103
+ return r
1104
+ },
1105
+ getStaTokenSummary: async (_t, token) => {
1106
+ srlog.info({ event: 'kpfun-getStaTokenSummary', token })
1107
+ //console.log('call getStaTokenSummary...')
1108
+ let r = await pf.getStaTokenSummary(token, { fun: funCheckAdmin })
1109
+ //console.log('call getStaTokenSummary end')
1110
+ return r
1111
+ },
1112
+ getStaIpSummary: async (_t, token) => {
1113
+ srlog.info({ event: 'kpfun-getStaIpSummary', token })
1114
+ //console.log('call getStaIpSummary...')
1115
+ let r = await pf.getStaIpSummary(token, { fun: funCheckAdmin })
1116
+ //console.log('call getStaIpSummary end')
1117
+ return r
1118
+ },
804
1119
 
805
- return procSettings.setSettings(st)
1120
+ getStaUserAccountLogin: async (_t, token) => {
1121
+ srlog.info({ event: 'kpfun-getStaUserAccountLogin', token })
1122
+ //console.log('call getStaUserAccountLogin...')
1123
+ let r = await pf.checkTokenAndGetStaUserAccountLogin(token, { fun: funCheckAdmin })
1124
+ //console.log('call getStaUserAccountLogin end')
1125
+ return r
806
1126
  },
807
- //...
1127
+ getStaToken: async (_t, token) => {
1128
+ srlog.info({ event: 'kpfun-getStaToken', token })
1129
+ //console.log('call getStaToken...')
1130
+ let r = await pf.checkTokenAndGetStaToken(token, { fun: funCheckAdmin })
1131
+ //console.log('call getStaToken end')
1132
+ return r
1133
+ },
1134
+ getStaIp: async (_t, token) => {
1135
+ srlog.info({ event: 'kpfun-getStaIp', token })
1136
+ //console.log('call getStaIp...')
1137
+ let r = await pf.checkTokenAndGetStaIp(token, { fun: funCheckAdmin })
1138
+ //console.log('call getStaIp end')
1139
+ return r
1140
+ },
1141
+
1142
+ // getSettings: async (_t, token) => {
1143
+
1144
+ // //checkToken
1145
+ // await p.checkToken(token)
1146
+
1147
+ // return procSettings.getSettings()
1148
+ // },
1149
+ // updateSettings: async (_t, token, st) => {
1150
+
1151
+ // //checkToken
1152
+ // await p.checkToken(token)
1153
+
1154
+ // return procSettings.setSettings(st)
1155
+ // },
1156
+
808
1157
  },
809
1158
  fnTableTags: 'tableTags-web-sso.json',
810
1159
  })
@@ -829,7 +1178,7 @@ export default WWebSso
829
1178
  <br class="clear">
830
1179
 
831
1180
  <footer>
832
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Jun 07 2025 20:41:04 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
1181
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Sat Jul 12 2025 22:44:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
833
1182
  </footer>
834
1183
 
835
1184
  <script>prettyPrint();</script>