fix: Fix the issue of abnormal token refreshing on alipan (#8747)

ssongliu · web-flow · commit 9822427de85f · 2025-05-20T13:42:01.000+08:00
diff --git a/agent/app/service/backup.go b/agent/app/service/backup.go
@@ -281,7 +281,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByID) error {
 	}
 	varMap := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
-		return fmt.Errorf("Failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)
+		return fmt.Errorf("failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)
 	}
 	var (
 		refreshToken string
@@ -298,7 +298,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByID) error {
 	if err != nil {
 		varMap["refresh_status"] = constant.StatusFailed
 		varMap["refresh_msg"] = err.Error()
-		return fmt.Errorf("Failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)
+		return fmt.Errorf("failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)
 	}
 	varMap["refresh_status"] = constant.StatusSuccess
 	varMap["refresh_time"] = time.Now().Format(constant.DateTimeLayout)
diff --git a/agent/cron/job/backup.go b/agent/cron/job/backup.go
@@ -29,7 +29,7 @@ func (b *backup) Run() {
 		global.LOG.Infof("Start to refresh %s-%s access_token ...", backupItem.Type, backupItem.Name)
 		varMap := make(map[string]interface{})
 		if err := json.Unmarshal([]byte(backupItem.Vars), &varMap); err != nil {
-			global.LOG.Errorf("Failed to refresh %s - %s token, please retry, err: %v", backupItem.Type, backupItem.Name, err)
+			global.LOG.Errorf("failed to refresh %s - %s token, please retry, err: %v", backupItem.Type, backupItem.Name, err)
 			continue
 		}
 		var (
@@ -47,7 +47,7 @@ func (b *backup) Run() {
 		if err != nil {
 			varMap["refresh_status"] = constant.StatusFailed
 			varMap["refresh_msg"] = err.Error()
-			global.LOG.Errorf("Failed to refresh OneDrive token, please retry, err: %v", err)
+			global.LOG.Errorf("failed to refresh OneDrive token, please retry, err: %v", err)
 			continue
 		}
 		varMap["refresh_status"] = constant.StatusSuccess
diff --git a/agent/utils/cloud_storage/client/ali.go b/agent/utils/cloud_storage/client/ali.go
@@ -477,7 +477,7 @@ func (a *aliClient) completeUpload(uploadID, fileID string) error {
 }
 
 type tokenResp struct {
-	AccessToken string `json:"access_token"`
+	RefreshToken string `json:"refresh_token"`
 }
 
 func loadToken(refresh_token string) (string, error) {
@@ -502,7 +502,7 @@ func loadToken(refresh_token string) (string, error) {
 	if err := json.Unmarshal(resp.Body(), &respItem); err != nil {
 		return "", err
 	}
-	return respItem.AccessToken, nil
+	return respItem.RefreshToken, nil
 }
 
 func RefreshALIToken(varMap map[string]interface{}) (string, error) {
@@ -531,5 +531,5 @@ func RefreshALIToken(varMap map[string]interface{}) (string, error) {
 	if err := json.Unmarshal(resp.Body(), &respItem); err != nil {
 		return "", err
 	}
-	return respItem.AccessToken, nil
+	return respItem.RefreshToken, nil
 }
diff --git a/core/app/service/backup.go b/core/app/service/backup.go
@@ -259,7 +259,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByName) error {
 	}
 	varMap := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
-		return fmt.Errorf("Failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)
+		return fmt.Errorf("failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)
 	}
 	var (
 		refreshToken string
@@ -276,7 +276,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByName) error {
 	if err != nil {
 		varMap["refresh_status"] = constant.StatusFailed
 		varMap["refresh_msg"] = err.Error()
-		return fmt.Errorf("Failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)
+		return fmt.Errorf("failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)
 	}
 	varMap["refresh_status"] = constant.StatusSuccess
 	varMap["refresh_time"] = time.Now().Format(constant.DateTimeLayout)
diff --git a/core/init/cron/job/backup.go b/core/init/cron/job/backup.go
@@ -30,7 +30,7 @@ func (b *backup) Run() {
 		global.LOG.Infof("Start to refresh %s-%s access_token ...", backupItem.Type, backupItem.Name)
 		varMap := make(map[string]interface{})
 		if err := json.Unmarshal([]byte(backupItem.Vars), &varMap); err != nil {
-			global.LOG.Errorf("Failed to refresh %s - %s token, please retry, err: %v", backupItem.Type, backupItem.Name, err)
+			global.LOG.Errorf("failed to refresh %s - %s token, please retry, err: %v", backupItem.Type, backupItem.Name, err)
 			continue
 		}
 		var (
@@ -48,7 +48,7 @@ func (b *backup) Run() {
 		if err != nil {
 			varMap["refresh_status"] = constant.StatusFailed
 			varMap["refresh_msg"] = err.Error()
-			global.LOG.Errorf("Failed to refresh %s-%s token, please retry, err: %v", backupItem.Type, backupItem.Name, err)
+			global.LOG.Errorf("failed to refresh %s-%s token, please retry, err: %v", backupItem.Type, backupItem.Name, err)
 			continue
 		}
 		varMap["refresh_status"] = constant.StatusSuccess
diff --git a/core/utils/cloud_storage/client/ali.go b/core/utils/cloud_storage/client/ali.go
@@ -338,7 +338,7 @@ func (a *aliClient) completeUpload(uploadID, fileID string) error {
 }
 
 type tokenResp struct {
-	AccessToken string `json:"access_token"`
+	RefreshToken string `json:"refresh_token"`
 }
 
 func RefreshALIToken(varMap map[string]interface{}) (string, error) {
@@ -367,5 +367,5 @@ func RefreshALIToken(varMap map[string]interface{}) (string, error) {
 	if err := json.Unmarshal(resp.Body(), &respItem); err != nil {
 		return "", err
 	}
-	return respItem.AccessToken, nil
+	return respItem.RefreshToken, nil
 }
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -154,7 +154,7 @@ const message = {
             createSuccess: 'Create Success',
             updateSuccess: 'Update Success',
             uploadSuccess: 'Update Success',
-            operateConfirm: 'If you are sure about the operation, please input it manually',
+            operateConfirm: 'If you are sure about the operation, please input it manually ',
             inputOrSelect: 'Please select or enter',
             copyFailed: 'Copy failed',
             operatorHelper: 'Would you like to continue performing {1} operation on {0}?',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
@@ -146,7 +146,7 @@ const message = {
             createSuccess: 'Berjaya dicipta',
             updateSuccess: 'Berjaya dikemas kini',
             uploadSuccess: 'Berjaya dimuat naik',
-            operateConfirm: 'Jika anda pasti dengan operasi ini, sila masukkan secara manual:',
+            operateConfirm: 'Jika anda pasti dengan operasi ini, sila masukkan secara manual: ',
             inputOrSelect: 'Sila pilih atau masukkan',
             copyFailed: 'Gagal disalin',
             operatorHelper:
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
@@ -146,7 +146,7 @@ const message = {
             createSuccess: 'Criado com sucesso',
             updateSuccess: 'Atualizado com sucesso',
             uploadSuccess: 'Enviado com sucesso',
-            operateConfirm: 'Se você tem certeza da operação, insira-a manualmente:',
+            operateConfirm: 'Se você tem certeza da operação, insira-a manualmente: ',
             inputOrSelect: 'Por favor, selecione ou insira',
             copyFailed: 'Falha ao copiar',
             operatorHelper: 'A operação "{1}" será realizada em "{0}" e não poderá ser desfeita. Deseja continuar?',
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
@@ -151,7 +151,7 @@ const message = {
             createSuccess: '創建成功',
             updateSuccess: '更新成功',
             uploadSuccess: '上傳成功',
-            operateConfirm: '如果確認操作，請手動輸入',
+            operateConfirm: '如果確認操作，請手動輸入 ',
             inputOrSelect: '請選擇或輸入',
             copyFailed: '復製失敗',
             operatorHelper: '將對以下{0}進行{1}操作，是否繼續？',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
@@ -151,7 +151,7 @@ const message = {
             createSuccess: '创建成功',
             updateSuccess: '更新成功',
             uploadSuccess: '上传成功',
-            operateConfirm: '如果确认操作，请手动输入',
+            operateConfirm: '如果确认操作，请手动输入 ',
             inputOrSelect: '请选择或输入',
             copyFailed: '复制失败',
             operatorHelper: '将对以下{0}进行 {1} 操作，是否继续？',
diff --git a/frontend/src/views/setting/backup-account/index.vue b/frontend/src/views/setting/backup-account/index.vue
@@ -277,9 +277,16 @@ const onInspect = (row: any) => {
 };
 
 const refreshItemToken = async (row: any) => {
-    await refreshToken({ id: row.id, name: row.name, isPublic: row.isPublic });
-    MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
-    search();
+    loading.value = true;
+    await refreshToken({ id: row.id, name: row.name, isPublic: row.isPublic })
+        .then(() => {
+            loading.value = false;
+            MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
+            search();
+        })
+        .catch(() => {
+            loading.value = false;
+        });
 };
 
 const buttons = [

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByID) error {`
`281`	`281`	`}`
`282`	`282`	`varMap := make(map[string]interface{})`
`283`	`283`	`if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {`
`284`		`- return fmt.Errorf("Failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)`
	`284`	`+ return fmt.Errorf("failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)`
`285`	`285`	`}`
`286`	`286`	`var (`
`287`	`287`	`refreshToken string`
`@@ -298,7 +298,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByID) error {`
`298`	`298`	`if err != nil {`
`299`	`299`	`varMap["refresh_status"] = constant.StatusFailed`
`300`	`300`	`varMap["refresh_msg"] = err.Error()`
`301`		`- return fmt.Errorf("Failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)`
	`301`	`+ return fmt.Errorf("failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)`
`302`	`302`	`}`
`303`	`303`	`varMap["refresh_status"] = constant.StatusSuccess`
`304`	`304`	`varMap["refresh_time"] = time.Now().Format(constant.DateTimeLayout)`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ func (a *aliClient) completeUpload(uploadID, fileID string) error {`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`type tokenResp struct {`
`480`		- AccessToken string `json:"access_token"`
	`480`	+ RefreshToken string `json:"refresh_token"`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`func loadToken(refresh_token string) (string, error) {`
`@@ -502,7 +502,7 @@ func loadToken(refresh_token string) (string, error) {`
`502`	`502`	`if err := json.Unmarshal(resp.Body(), &respItem); err != nil {`
`503`	`503`	`return "", err`
`504`	`504`	`}`
`505`		`- return respItem.AccessToken, nil`
	`505`	`+ return respItem.RefreshToken, nil`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`func RefreshALIToken(varMap map[string]interface{}) (string, error) {`
`@@ -531,5 +531,5 @@ func RefreshALIToken(varMap map[string]interface{}) (string, error) {`
`531`	`531`	`if err := json.Unmarshal(resp.Body(), &respItem); err != nil {`
`532`	`532`	`return "", err`
`533`	`533`	`}`
`534`		`- return respItem.AccessToken, nil`
	`534`	`+ return respItem.RefreshToken, nil`
`535`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByName) error {`
`259`	`259`	`}`
`260`	`260`	`varMap := make(map[string]interface{})`
`261`	`261`	`if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {`
`262`		`- return fmt.Errorf("Failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)`
	`262`	`+ return fmt.Errorf("failed to refresh %s - %s token, please retry, err: %v", backup.Type, backup.Name, err)`
`263`	`263`	`}`
`264`	`264`	`var (`
`265`	`265`	`refreshToken string`
`@@ -276,7 +276,7 @@ func (u *BackupService) RefreshToken(req dto.OperateByName) error {`
`276`	`276`	`if err != nil {`
`277`	`277`	`varMap["refresh_status"] = constant.StatusFailed`
`278`	`278`	`varMap["refresh_msg"] = err.Error()`
`279`		`- return fmt.Errorf("Failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)`
	`279`	`+ return fmt.Errorf("failed to refresh %s-%s token, please retry, err: %v", backup.Type, backup.Name, err)`
`280`	`280`	`}`
`281`	`281`	`varMap["refresh_status"] = constant.StatusSuccess`
`282`	`282`	`varMap["refresh_time"] = time.Now().Format(constant.DateTimeLayout)`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ func (a *aliClient) completeUpload(uploadID, fileID string) error {`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`type tokenResp struct {`
`341`		- AccessToken string `json:"access_token"`
	`341`	+ RefreshToken string `json:"refresh_token"`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`func RefreshALIToken(varMap map[string]interface{}) (string, error) {`
`@@ -367,5 +367,5 @@ func RefreshALIToken(varMap map[string]interface{}) (string, error) {`
`367`	`367`	`if err := json.Unmarshal(resp.Body(), &respItem); err != nil {`
`368`	`368`	`return "", err`
`369`	`369`	`}`
`370`		`- return respItem.AccessToken, nil`
	`370`	`+ return respItem.RefreshToken, nil`
`371`	`371`	`}`