Skip to content

fix: Fix compatibility issue with some OneDrive addition failures #11748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Jan 30, 2026
+7 −15
Merged

fix: Fix compatibility issue with some OneDrive addition failures #11748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/app/service/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ func loadRefreshTokenByCode(backup *model.BackupAccount) (string, error) {
if err := json.Unmarshal([]byte(backup.Vars), &varMap); err != nil {
return "", fmt.Errorf("unmarshal backup vars failed, err: %v", err)
}
if _, ok := varMap["refresh_token"]; ok {
if token, ok := varMap["refresh_token"]; ok && len(token.(string)) != 0 {
return "", nil
}
refreshToken := ""
Expand Down
20 changes: 6 additions & 14 deletions frontend/src/views/setting/backup-account/operate/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
>
<el-input v-model.trim="dialogData.rowData!.varsJson['redirect_uri']" />
</el-form-item>
<el-form-item :label="$t('setting.code')" prop="varsJson.code" :rules="rules.driveCode">
<el-form-item :label="$t('setting.code')" prop="varsJson.code">
<div class="!w-full">
<el-input
style="width: calc(100% - 80px)"
Expand Down Expand Up @@ -430,19 +430,6 @@ const regionInput = ref();

const domainProto = ref('http');
const emit = defineEmits(['search']);
const rules = reactive({
driveCode: [{ validator: checkDriveCode, required: true, trigger: 'blur' }],
});
function checkDriveCode(rule: any, value: any, callback: any) {
if (!value) {
return callback(new Error(i18n.global.t('setting.codeWarning')));
}
const reg = /^[A-Za-z0-9/_.-]+$/;
if (!reg.test(value)) {
return callback(new Error(i18n.global.t('setting.codeWarning')));
}
callback();
}

interface DialogProps {
title: string;
Expand Down Expand Up @@ -726,6 +713,11 @@ const onCheck = async (formEl: FormInstance | undefined) => {
dialogData.value.rowData!.varsJson['endpoint'] = itemEndpoint;
}
}
if (isOneDrive()) {
dialogData.value.rowData!.varsJson['code'] = decodeURIComponent(
dialogData.value.rowData!.varsJson['code'] || '',
);
}
if (isALIYUNYUN()) {
dialogData.value.rowData!.varsJson['token'] = undefined;
}
Expand Down
Loading