nsgm-cli 2.1.9 → 2.1.10

package/client/utils/sso.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import { setCookie, getCookie, delCookie } from './cookie'
-import { getUrlParamByKey, getLocalApiPrefix, getLocalEnv } from './common'
+import { getUrlParamByKey, getLocalApiPrefix, getLocalEnv, handleXSS } from './common'
 import _ from 'lodash'
 
 const env = getLocalEnv()
@@ -180,26 +180,66 @@ export const login = (callback: any) => {
   if (typeof window !== 'undefined') {
     const locationHref = window.location.href
 
-    if (locationHref.indexOf('/login') === -1) {
+    // 如果已经在登录页面，不需要进行登录检查
+    if (locationHref.indexOf('/login') !== -1) {
+      callback && callback()
+      return
+    }
 
-      if (cookieLoginValue !== '') {
-        principalLogin(cookieLoginValue, callback)
-      } else {
-        const urlParamTicket = getUrlParamByKey('ticket')
-        const urlParamName = getUrlParamByKey('name')
-        // console.log('urlParamTicket', urlParamTicket, urlParamName)
+    // 如果没有登录凭证，立即跳转到登录页面
+    if (cookieLoginValue === '') {
+      const urlParamTicket = getUrlParamByKey('ticket')
+      const urlParamName = getUrlParamByKey('name')
 
-        if (urlParamTicket !== '') {
-          validateLogin(urlParamTicket, urlParamName, callback)
-        } else {
-          jumpToLogin()
-        }
+      if (urlParamTicket !== '') {
+        validateLogin(urlParamTicket, urlParamName, callback)
+      } else {
+        // 没有ticket参数，直接跳转到登录页
+        jumpToLogin()
+        // 不执行回调，因为页面将被重定向
+        return
       }
+    } else {
+      // 有登录凭证，验证登录状态
+      principalLogin(cookieLoginValue, callback)
     }
+  } else {
+    callback && callback()
+  }
+}
+
+export const directLogin = (userName: string, userPassword: string, callback: any) => {
+  if (userName === '') {
+    return { success: false, message: '请输入用户名' };
   }
+  if (userPassword === '') {
+    return { success: false, message: '请输入密码' };
+  }
+
+  // 使用 encodeURIComponent 处理可能的特殊字符，然后再进行 Base64 编码
+  const safeStr = handleXSS(userName + "," + userPassword);
+  const encodedName = btoa(encodeURIComponent(safeStr));
+  const url = `${getLocalApiPrefix()}/rest/sso/ticketCheck?ticket=XXX&name=${encodedName}`;
+
+  return fetch(url)
+    .then(response => response.json())
+    .then(data => {
+      if (data && data.returnCode === 0) {
+        // 登录成功，设置cookie
+        if (typeof window !== 'undefined') {
+          storeLogin(data.cookieValue, data.cookieExpire, data.userAttr, callback);
+          return { success: true };
+        }
+      }
+      return { success: false, message: '用户名或密码错误' };
+    })
+    .catch(error => {
+      console.error('登录请求失败:', error);
+      return { success: false, message: '登录请求失败，请稍后重试' };
+    });
 }
 
 export const logout = () => {
-  jumpToLogout()
+  jumpToLogin()
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsgm-cli",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
   "main": "index.js",
   "scripts": {

package/pages/_app.tsx

@@ -18,13 +18,35 @@ const App = ({ Component, pageProps }) => {
   const store = useStore(pageProps.initialReduxState)
   const [ssoUser, setSsoUser] = useState(null)
   const [pageLoad, setPageLoad] = useState(false)
+  const [loginChecked, setLoginChecked] = useState(false)
 
   useEffect(() => {
+    // 检查当前路径是否为登录页
+    const isLoginPage = typeof window !== 'undefined' && window.location.pathname === '/login'
+    
+    // 如果是登录页，直接设置加载完成
+    if (isLoginPage) {
+      setLoginChecked(true)
+      setPageLoad(true)
+      return
+    }
+    
+    // 检查是否有登录凭证
+    const hasLoginCookie = typeof window !== 'undefined' && document.cookie.includes('_cas_nsgm')
+    
+    // 如果没有登录凭证，直接跳转到登录页面
+    if (!hasLoginCookie && typeof window !== 'undefined') {
+      window.location.href = window.location.origin + '/login'
+      return
+    }
+    
+    // 否则执行登录检查
     login((user: any) => {
       if (user) {
         // console.log('checkLogin_user', user)
         setSsoUser(user)
       }
+      setLoginChecked(true)
     })
 
     setTimeout(() => {
@@ -38,14 +60,23 @@ const App = ({ Component, pageProps }) => {
       <ThemeProvider theme={theme}>
         <Provider store={store}>
           {
-            pageLoad ?
-              ssoUser ? <LayoutComponent user={ssoUser}>
+            !loginChecked ? (
+              <Loading>
+                <Spin size="large" />
+              </Loading>
+            ) : pageLoad ? (
+              ssoUser ? (
+                <LayoutComponent user={ssoUser}>
+                  <Component {...pageProps} />
+                </LayoutComponent>
+              ) : (
                 <Component {...pageProps} />
-              </LayoutComponent> :
-                <Component {...pageProps} /> :
+              )
+            ) : (
               <Loading>
                 <Spin size="large" />
               </Loading>
+            )
           }
         </Provider>
       </ThemeProvider>

package/pages/login.tsx

@@ -3,9 +3,10 @@ import _ from 'lodash'
 import { LoginContainer } from '../client/styled/common'
 // import getConfig from 'next/config'
 import React, { useState } from 'react'
-import { handleXSS } from '../client/utils/common'
+import { getLocalEnv } from '../client/utils/common'
 import { Input, Button, Form, Typography, message } from 'antd'
 import { UserOutlined, LockOutlined } from '@ant-design/icons'
+import { directLogin } from '../client/utils/sso'
 
 const md = new MarkdownIt({
   html: true,
@@ -24,6 +25,9 @@ renderArr.push('Login')
 const Page = ({ html }) => {
   const [userName, setUserName] = useState("")
   const [userPassword, setUserPassword] = useState("")
+  const env = getLocalEnv()
+  const LOGIN_COOKIE_ID = env + '_cas_nsgm'
+  const LOGIN_COOKIE_USER = env + '_nsgm_user'
 
   const createMarkup = () => {
     return {
@@ -42,9 +46,15 @@ const Page = ({ html }) => {
         return;
       }
 
-      let locationHref = window.location.origin + "?ticket=XXX"
-      locationHref += "&name=" + btoa(handleXSS(userName + "," + userPassword))
-      window.location.href = locationHref
+      directLogin(userName, userPassword, (user) => {
+        if (user) {
+          window.location.href = window.location.origin;
+        }
+      }).then(result => {
+        if (!result.success) {
+          message.error(result.message);
+        }
+      });
     }
   }
 

package/server/apis/sso.js

@@ -4,9 +4,9 @@ const router = express.Router()
 
 router.get('/sessionCheck', (req, res) => {
   const { query } = req
-  const { cookieValue, redirectUrl, appId } = query 
+  // const { cookieValue, redirectUrl, appId } = query
 
-  res.json({ 
+  res.json({
     name: 'sessionCheck',
     query,
     returnCode: 0,
@@ -18,11 +18,13 @@ router.get('/sessionCheck', (req, res) => {
 
 router.get('/ticketCheck', (req, res) => {
   const { query } = req
-  const { ticket, name } = query
-  // console.log('name', name, atob(name))
+  const { name } = query
+  // 使用 Buffer 解码 Base64 字符串，然后使用 decodeURIComponent 处理特殊字符
+  const decodedBase64 = Buffer.from(name, 'base64').toString('utf-8')
+  const decodedName = decodeURIComponent(decodedBase64)
 
-  if(atob(name) === "erishen,123456"){
-    res.json({ 
+  if (decodedName === "erishen,123456") {
+    res.json({
       name: 'ticketCheck',
       query,
       returnCode: 0,
@@ -33,7 +35,7 @@ router.get('/ticketCheck', (req, res) => {
       cookieExpire: 10000
     })
   } else {
-    res.json({ 
+    res.json({
       name: 'ticketCheck',
       query,
       returnCode: -1