w-web-sso 1.0.38 → 1.0.39

package/src/plugins/mUI.mjs

@@ -43,7 +43,6 @@ import arrInsert from 'wsemi/src/arrInsert.mjs'
 import replace from 'wsemi/src/replace.mjs'
 import timemsTZ2past from 'wsemi/src/timemsTZ2past.mjs'
 import convertToTree from 'wsemi/src/convertToTree.mjs'
-// import WUiDwload from 'w-ui-dwload/src/WUiDwload.mjs'
 
 
 let vo = Vue.prototype
@@ -134,16 +133,19 @@ function validLang(lang) {
 function getLang() {
     let lang = ''
 
-    //from window
+    //from URL ?lang= (轉址攜帶語系時最優先，例如登入後 redirect 帶當前語系)
     if (!isestr(lang)) {
-        let _lang = get(window, '___pmwsso___.language', '')
-        // console.log('_lang(from window)', _lang)
-        if (isestr(_lang)) {
-            lang = validLang(_lang) //有可能取到未取代前模板符號
+        try {
+            let _lang = new URLSearchParams(window.location.search).get('lang') || ''
+            // console.log('_lang(from url)', _lang)
+            if (isestr(_lang)) {
+                lang = validLang(_lang)
+            }
         }
+        catch (err) {}
     }
 
-    //from store
+    //from store (使用者當下選的，或 App.vue beforeMount 已設定)
     if (!isestr(lang)) {
         let _lang = get(vo, '$store.state.lang', '')
         // console.log('_lang(from store)', _lang)
@@ -152,6 +154,15 @@ function getLang() {
         }
     }
 
+    //from window (server 預設語系，fallback)
+    if (!isestr(lang)) {
+        let _lang = get(window, '___pmwsso___.language', '')
+        // console.log('_lang(from window)', _lang)
+        if (isestr(_lang)) {
+            lang = validLang(_lang) //有可能取到未取代前模板符號
+        }
+    }
+
     //validLang
     lang = validLang(lang) //有可能給予非預期lang
 
@@ -217,6 +228,23 @@ function getKpText(key) {
 }
 
 
+//getKpTextErr: 錯誤訊息專用翻譯 — 先 getKpText(key) 取得模板, 再插值密碼政策值 (minLength / maxLength /
+//consecutiveCharsMinMatch 來自 webInfor.passwordPolicyInfo, 即時反映 settings). 供「錯誤 reject key」顯示用:
+//多數錯誤 key 無模板變數 (replace 為 no-op); 僅密碼政策 key (userPassword_keyLim*) 含 {minLength} 等需插值.
+//設計: 後端一律 reject key 字串 (msg-key 契約), 前端統一以 $tErr(key) 翻譯+插值顯示.
+function getKpTextErr(key) {
+    let t = getKpText(key)
+    if (!isestr(t)) {
+        return t
+    }
+    let p = get(vo, '$store.state.webInfor.passwordPolicyInfo', {})
+    t = t.replace('{minLength}', get(p, 'minLength', ''))
+    t = t.replace('{maxLength}', get(p, 'maxLength', ''))
+    t = t.replace('{consecutiveCharsMinMatch}', get(p, 'consecutiveCharsMinMatch', ''))
+    return t
+}
+
+
 function syncHeight() {
 
     //heightToolbar
@@ -302,21 +330,23 @@ function getUrlView() {
 }
 
 
-function goUrl(url, token) {
+function goUrl(url, token, lang) {
 
-    //replace
+    //replace {token}
     url = url.replaceAll('{token}', token)
 
+    //replace {lang} 佔位符（若 redir 模板顯式包含）
+    if (isestr(lang)) {
+        url = url.replaceAll('{lang}', lang)
+    }
+
+    //自動 append &lang= 給轉址後的系統作為依據（已含 lang 參數則不覆寫）
+    if (isestr(lang) && !/[?&]lang=/.test(url)) {
+        let sep = url.includes('?') ? '&' : '?'
+        url = `${url}${sep}lang=${encodeURIComponent(lang)}`
+    }
+
     //href
-    // if (isDev()) {
-    //     console.log('10s後重導至:', url)
-    //     setTimeout(() => {
-    //         window.location.href = url
-    //     }, 10 * 1000)
-    // }
-    // else {
-    //     window.location.href = url
-    // }
     window.location.href = url
 
 }
@@ -337,10 +367,10 @@ function login(account, password, opt = {}) {
     //pm
     let pm = genPm()
 
-    async function core() {
+    //hideLoading, 結束預設隱藏loading, 只有當成功登入要轉址時不隱藏loading, 其他成功或失敗都要隱藏
+    let hideLoadingForEnd = true
 
-        //show loading
-        updateLoading(true)
+    let core = async() => {
 
         //delay
         await delay(1000)
@@ -357,11 +387,15 @@ function login(account, password, opt = {}) {
             //reject
             pm.reject('invalid $keyLS')
 
+            //結束後隱藏loading
+            hideLoadingForEnd = true
+
             return
         }
 
-        //loginByAccountAndPassword
-        let u = await vo.$fapi.loginByAccountAndPassword(account, password)
+        //loginByAccountAndPassword (帶 lang, 後端 reject { key, msg } 之 msg 依 lang 翻譯)
+        let langLogin = get(vo, '$store.state.lang', 'eng')
+        let u = await vo.$fapi.loginByAccountAndPassword(langLogin, account, password)
         // console.log('u', u)
 
         //key
@@ -378,6 +412,9 @@ function login(account, password, opt = {}) {
             //reject
             pm.reject('invalid user')
 
+            //結束後隱藏loading
+            hideLoadingForEnd = true
+
             return
         }
 
@@ -394,6 +431,9 @@ function login(account, password, opt = {}) {
             //reject
             pm.reject('invalid token')
 
+            //結束後隱藏loading
+            hideLoadingForEnd = true
+
             return
         }
 
@@ -404,6 +444,13 @@ function login(account, password, opt = {}) {
         updateUserToken(token)
         updateUserSelf(u)
 
+        //強制變更密碼模式: 不論原本是否要 useRedir, 一律不走 redir,
+        //並把 view 切到 'user' 確保 PageUser 進入強制變更模式 (見 PageUser.mounted)
+        if (get(u, 'isForceChangePw', '') === 'y') {
+            useRedir = false
+            updateViewState('user')
+        }
+
         //useRedir
         if (useRedir) {
 
@@ -420,43 +467,57 @@ function login(account, password, opt = {}) {
                 //reject
                 pm.reject('invalid redir')
 
+                //結束後隱藏loading
+                hideLoadingForEnd = true
+
                 return
             }
 
-            //goUrl
-            goUrl(redir, token)
-            // console.log('goUrl', redir, 'token', token)
+            //goUrl，帶上當前 lang 讓轉址後系統能讀 ?lang=
+            let lang = get(vo, '$store.state.lang', '')
+            goUrl(redir, token, lang)
+            // console.log('goUrl', redir, 'token', token, 'lang', lang)
 
             //resolve
             pm.resolve('redir')
 
-            // //hide loading, 登入成功不能先隱藏loading, 開始轉址到轉跳會有一段時間, 持續顯示loading不隱藏, 避免使用者誤會登入失敗
-            // updateLoading(false)
+            //結束後不隱藏loading, 因開始轉址到轉跳會有一段時間, 持續顯示loading不隱藏, 避免使用者誤會登入失敗
+            hideLoadingForEnd = false
 
             return
         }
 
-        //hide loading, 登入成功後且非轉址時隱藏loading
-        updateLoading(false)
+        //結束後隱藏loading, 登入成功後且非轉址時隱藏loading
+        hideLoadingForEnd = true
 
         //resolve
         pm.resolve('done')
 
     }
 
+    //show loading
+    updateLoading(true)
+
     //core
     core()
         .catch((err) => {
             // console.log('login', err)
 
-            //alert
-            vo.$alert(vo.$t('failedLoginForCatch'), { type: 'error' })
+            // //alert
+            // vo.$alert(vo.$t('failedLoginForCatch'), { type: 'error' })
 
             //reject
             pm.reject(err)
 
-            //hide loading, 登入失敗後隱藏loading
-            updateLoading(false)
+        })
+        .finally(() => {
+
+            if (hideLoadingForEnd) {
+
+                //hide loading, 登入失敗後隱藏loading
+                updateLoading(false)
+
+            }
 
         })
 
@@ -482,7 +543,7 @@ function autoLogin(opt = {}) {
     //pm
     let pm = genPm()
 
-    async function core() {
+    let core = async () => {
         let errTemp = null
 
         //waitFun, 因須使用webKey故須等待syncState
@@ -519,29 +580,33 @@ function autoLogin(opt = {}) {
 
         //check
         if (!isestr(token)) {
-            // console.log('invalid token')
+            // console.log('no token')
 
             //reject
-            pm.reject('invalid token')
+            pm.reject('no token')
 
             return
         }
 
         //checkToken
-        await vo.$fapi.checkToken(token) //斷線有重試機制, resolve僅回傳true, reject代表無效token或檢測token發生錯誤
+        let b = false
+        await vo.$fapi.checkToken(token) //斷線有重試機制; 後端 wrapper 在過期/無效時一律 reject, 僅在有效時 resolve(true), 不會 resolve(false)
+            .then((res) => {
+                b = res === true
+            })
             .catch((err) => {
                 // console.log('checkToken catch', err)
                 errTemp = err
             })
 
         //check
-        if (errTemp) {
+        if (errTemp || !b) {
 
             //setItem, 清空token
             await localStorage.setItem(key, '')
 
             //reject
-            pm.reject('token error')
+            pm.reject(errTemp ? 'token error' : 'token expired')
 
             return
         }
@@ -564,6 +629,13 @@ function autoLogin(opt = {}) {
         updateUserToken(token)
         updateUserSelf(u)
 
+        //強制變更密碼模式: 不論原本是否要 useRedir, 一律不走 redir,
+        //並把 view 切到 'user' 確保 PageUser 進入強制變更模式 (見 PageUser.mounted)
+        if (get(u, 'isForceChangePw', '') === 'y') {
+            useRedir = false
+            updateViewState('user')
+        }
+
         //useRedir
         if (useRedir) {
 
@@ -584,9 +656,10 @@ function autoLogin(opt = {}) {
                 return
             }
 
-            //goUrl
-            goUrl(redir, token)
-            // console.log('goUrl', redir, 'token', token)
+            //goUrl，帶上當前 lang 讓轉址後系統能讀 ?lang=
+            let lang = get(vo, '$store.state.lang', '')
+            goUrl(redir, token, lang)
+            // console.log('goUrl', redir, 'token', token, 'lang', lang)
 
             //resolve
             pm.resolve('redir')
@@ -604,8 +677,8 @@ function autoLogin(opt = {}) {
         .catch((err) => {
             // console.log('autoLogin', err)
 
-            //alert
-            vo.$alert(vo.$t('failedLoginForCatch'), { type: 'error' })
+            // //alert
+            // vo.$alert(vo.$t('failedLoginForCatch'), { type: 'error' })
 
             //reject
             pm.reject(err)
@@ -729,6 +802,7 @@ let mUI = {
 
     setLang,
     getKpText,
+    getKpTextErr,
 
     syncHeight,
 

package/src/schema/tables/users.mjs

@@ -54,6 +54,10 @@ let settings = {
         name: '是否為系統管理員',
         type: 'STRING',
     },
+    tokenVerify: {
+        name: '註冊後驗證用token',
+        type: 'STRING',
+    },
     timeVerified: {
         name: '驗證時間',
         type: 'STRING',
@@ -66,6 +70,10 @@ let settings = {
         name: '封鎖時間',
         type: 'STRING',
     },
+    isForceChangePw: { //僅'y'或'n'
+        name: '是否須強制變更密碼',
+        type: 'STRING',
+    },
     userId: {
         name: '創建使用者主鍵',
         type: 'STRING',
@@ -82,7 +90,7 @@ let settings = {
         name: '更新時間',
         type: 'STRING',
     },
-    isActive: {
+    isActive: { //僅'y'或'n'
         name: '是否有效',
         type: 'STRING',
     },
@@ -96,6 +104,9 @@ let funNew = (ndata = {}) => {
     o.userIdUpdate = o.userId
     o.timeUpdate = o.timeCreate
     o.isActive = 'y'
+    if (o.isForceChangePw !== 'y' && o.isForceChangePw !== 'n') {
+        o.isForceChangePw = 'n'
+    }
     return o
 }
 

package/srv.mjs

@@ -8,10 +8,10 @@ let st = getSettings()
 
 let url = st.dbUrl
 let db = st.dbName
-let pathSettings = './settings.json'
+let pathSettings = process.argv[2] || './settings.json'
 
 //WWebSso
-let instWWebSso = WWebSso(WOrm, url, db, pathSettings)
+let instWWebSso = WWebSso(WOrm, url, db, pathSettings, st)
 
 instWWebSso.on('error', (err) => {
     console.log(err)

package/dist/css/app.d7bc51ed.css

@@ -1 +0,0 @@
-@media (min-width:640px){.sm\:grid-cols-2[data-v-99dfb112]{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (min-width:1024px){.lg\:grid-cols-1[data-v-99dfb112]{grid-template-columns:repeat(1,minmax(0,1fr))}.lg\:grid-cols-4[data-v-99dfb112]{grid-template-columns:repeat(4,minmax(0,1fr))}}.status-danger[data-v-0620fb52]{background-color:#fef2f2;color:#b91c1c;border:1px solid #fecaca}.status-warning[data-v-0620fb52]{background-color:#fffbeb;color:#b45309;border:1px solid #fde68a}.status-success[data-v-0620fb52]{background-color:#f0fdf4;color:#15803d;border:1px solid #bbf7d0}.status-info[data-v-0620fb52]{background-color:#f8fafc;color:#475569;border:1px solid #e2e8f0}body,html{font-family:微軟正黑體,Microsoft JhengHei,MicrosoftJhengHeiRegular,Avenir,Helvetica,Arial,sans-serif;overflow-y:hidden}a,button,div,input,p,pre,span,textarea{font-family:inherit}