Update makefile and user model, add Telegram integration

makefile

@@ -1,7 +1,7 @@
 FRONTEND_DIR = ./web
 BACKEND_DIR = .
 
-.PHONY: all start-frontend start-backend
+.PHONY: all build-frontend start-backend
 
 all: start-frontend start-backend
 
@@ -9,12 +9,6 @@ build-frontend:
 	@echo "Building frontend..."
 	@cd $(FRONTEND_DIR) && npm install && DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build npm run build
 
-# 启动前端开发服务器
-start-frontend:
-	@echo "Starting frontend dev server..."
-	@cd $(FRONTEND_DIR) && npm start &
-
-# 启动后端开发服务器
 start-backend:
 	@echo "Starting backend dev server..."
 	@cd $(BACKEND_DIR) && go run main.go &

model/user.go

@@ -3,10 +3,11 @@ package model
 import (
 	"errors"
 	"fmt"
-	"gorm.io/gorm"
 	"one-api/common"
 	"strings"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 // User if you add sensitive fields, don't forget to clean them in setupLogin function.
@@ -21,6 +22,7 @@ type User struct {
 	Email            string         `json:"email" gorm:"index" validate:"max=50"`
 	GitHubId         string         `json:"github_id" gorm:"column:github_id;index"`
 	WeChatId         string         `json:"wechat_id" gorm:"column:wechat_id;index"`
+	TelegramId       string         `json:"telegram_id" gorm:"column:telegram_id;index"`
 	VerificationCode string         `json:"verification_code" gorm:"-:all"`                                    // this field is only for Email verification, don't save it to database!
 	AccessToken      string         `json:"access_token" gorm:"type:char(32);column:access_token;uniqueIndex"` // this token is for system management
 	Quota            int            `json:"quota" gorm:"type:int;default:0"`

web/src/components/LoginForm.js

@@ -100,6 +100,13 @@ const LoginForm = () => {
         }
     }
 
+    // 添加Telegram登录处理函数
+    const onTelegramLoginClicked = async () => {
+        // 这里调用后端API进行Telegram登录
+        // 例如: const res = await API.get(`/api/oauth/telegram`);
+        // 根据响应处理登录逻辑
+    };
+
     return (
         <div>
             <Layout>
@@ -142,7 +149,7 @@ const LoginForm = () => {
                                         忘记密码 <Link to='/reset'>点击重置</Link>
                                     </Text>
                                 </div>
-                                {status.github_oauth || status.wechat_login ? (
+                                {status.github_oauth || status.wechat_login || status.telegram_oauth ? (
                                     <>
                                         <Divider margin='12px' align='center'>
                                             第三方登录
@@ -167,6 +174,18 @@ const LoginForm = () => {
                                             {/*) : (*/}
                                             {/*    <></>*/}
                                             {/*)}*/}
+
+                                            {status.telegram_oauth ? (
+                                                <Button
+                                                    type='primary'
+                                                    // icon={<IconTelegram/>} // 假设您有Telegram的图标
+                                                    onClick={onTelegramLoginClicked}
+                                                >
+                                                    Telegram登录
+                                                </Button>
+                                            ) : (
+                                                <></>
+                                            )}
                                         </div>
                                     </>
                                 ) : (

web/src/components/PersonalSetting.js

@@ -443,6 +443,27 @@ const PersonalSetting = () => {
                                 </div>
                             </div>
 
+                            <div style={{marginTop: 10}}>
+                                <Typography.Text strong>Telegram</Typography.Text>
+                                <div style={{display: 'flex', justifyContent: 'space-between'}}>
+                                    <div>
+                                        <Input
+                                            value={userState.user && userState.user.telegram_id !== ''?userState.user.telegram_id:'未绑定'}
+                                            readonly={true}
+                                        ></Input>
+                                    </div>
+                                    <div>
+                                        <Button
+                                            disabled={(userState.user && userState.user.telegram_id !== '') || !status.telegram_oauth}
+                                        >
+                                            {
+                                                status.github_oauth?'绑定':'未启用'
+                                            }
+                                        </Button>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div style={{marginTop: 10}}>
                                 <Space>
                                     <Button onClick={generateAccessToken}>生成系统访问令牌</Button>

web/src/components/SystemSetting.js

@@ -34,7 +34,7 @@ const SystemSetting = () => {
         EmailDomainRestrictionEnabled: '',
         EmailDomainWhitelist: '',
         // telegram login
-        TelegramLoginEnabled: '',
+        TelegramOAuthEnabled: '',
         TelegramBotToken: '',
         TelegramBotName: '',
     });
@@ -81,7 +81,7 @@ const SystemSetting = () => {
             case 'EmailVerificationEnabled':
             case 'GitHubOAuthEnabled':
             case 'WeChatAuthEnabled':
-            case 'TelegramLoginEnabled':
+            case 'TelegramOAuthEnabled':
             case 'TurnstileCheckEnabled':
             case 'EmailDomainRestrictionEnabled':
             case 'RegisterEnabled':
@@ -240,7 +240,7 @@ const SystemSetting = () => {
     };
 
     const submitTelegramSettings = async () => {
-        await updateOption('TelegramLoginEnabled', inputs.TelegramLoginEnabled);
+        await updateOption('TelegramOAuthEnabled', inputs.TelegramOAuthEnabled);
         await updateOption('TelegramBotToken', inputs.TelegramBotToken);
         await updateOption('TelegramBotName', inputs.TelegramBotName);
     };
@@ -397,6 +397,12 @@ const SystemSetting = () => {
                             name='WeChatAuthEnabled'
                             onChange={handleInputChange}
                         />
+                        <Form.Checkbox
+                            checked={inputs.TelegramOAuthEnabled === 'true'}
+                            label='允许通过 Telegram 进行登录'
+                            name='TelegramOAuthEnabled'
+                            onChange={handleInputChange}
+                        />
                     </Form.Group>
                     <Form.Group inline>
                         <Form.Checkbox
@@ -596,25 +602,17 @@ const SystemSetting = () => {
                     <Divider />
                     <Header as='h3'>配置 Telegram 登录</Header>
                     <Form.Group inline>
-                        <Form.Checkbox
-                            checked={inputs.TelegramLoginEnabled === 'true'}
-                            label='允许通过 Telegram 进行登录'
-                            name='TelegramLoginEnabled'
-                            onChange={handleInputChange}
-                        />
                         <Form.Input
                             label='Telegram Bot Token'
                             name='TelegramBotToken'
                             value={inputs.TelegramBotToken}
                             placeholder='输入你的 Telegram Bot Token'
-                            onChange={handleInputChange}
                         />
                         <Form.Input
                             label='Telegram Bot 名称'
                             name='TelegramBotName'
                             value={inputs.TelegramBotName}
                             placeholder='输入你的 Telegram Bot 名称'
-                            onChange={handleInputChange}
                         />
                     </Form.Group>
                     <Form.Button onClick={submitTelegramSettings}>

web/src/pages/User/EditUser.js

@@ -19,7 +19,7 @@ const EditUser = (props) => {
     group: 'default'
   });
   const [groupOptions, setGroupOptions] = useState([]);
-  const { username, display_name, password, github_id, wechat_id, email, quota, group } =
+  const { username, display_name, password, github_id, wechat_id, telegram_id, email, quota, group } =
     inputs;
   const handleInputChange = (name, value) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
@@ -194,6 +194,13 @@ const EditUser = (props) => {
             placeholder='此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改'
             readonly
           />
+          <Input
+            name='telegram_id'
+            value={telegram_id}
+            autoComplete='new-password'
+            placeholder='此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改'
+            readonly
+          />
           <div style={{ marginTop: 20 }}>
             <Typography.Text>已绑定的邮箱账户</Typography.Text>
           </div>
@@ -205,7 +212,6 @@ const EditUser = (props) => {
             readonly
           />
         </Spin>
-
       </SideSheet>
     </>
   );