Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-07-17 16:37:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/issue-6746'

Browse source 
* fix/issue-6746:
  fix(sync): improve error messages for auth code exchange failures
This commit is contained in:
Johannes Millan 2026-03-06 11:21:25 +01:00
commit 9ef05b4fab
4 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/app/imex/sync/sync-wrapper.service.ts
View file

@ -17,6 +17,7 @@ import {
LocalDataConflictError,
WebCryptoNotAvailableError,
MissingRefreshTokenAPIError,
HttpNotOkAPIError,
} from '../../op-log/core/errors/sync-errors';
import { MAX_LWW_REUPLOAD_RETRIES } from '../../op-log/core/operation-log.const';
import { SyncConfig } from '../../features/config/global-config.model';
@ -679,11 +680,14 @@ export class SyncWrapperService {
}
} catch (error) {
SyncLog.err(`Failed to configure auth for provider ${providerId}:`, error);
const isTokenExchangeError =
error instanceof HttpNotOkAPIError && error.response?.status === 400;
this._snackService.open({
// TODO don't limit snack to dropbox
msg: T.F.DROPBOX.S.UNABLE_TO_GENERATE_PKCE_CHALLENGE,
msg: isTokenExchangeError
? T.F.SYNC.S.INVALID_AUTH_CODE
: T.F.SYNC.S.AUTH_SETUP_FAILED,
type: 'ERROR',
config: { duration: 0 }, // Stay visible until dismissed for critical setup errors
config: { duration: 0 },
});
return { wasConfigured: false };
}

10
src/app/op-log/sync-providers/file-based/dropbox/dropbox-api.ts
View file

@ -454,8 +454,10 @@ export class DropboxApi {
});
if (response.status < 200 || response.status >= 300) {
const bodyStr = JSON.stringify(response.data);
throw new HttpNotOkAPIError(
new Response(JSON.stringify(response.data), { status: response.status }),
new Response(bodyStr, { status: response.status }),
bodyStr,
);
}
@ -471,7 +473,11 @@ export class DropboxApi {
});
if (!response.ok) {
throw new HttpNotOkAPIError(response);
const bodyStr = await response.text();
throw new HttpNotOkAPIError(
new Response(bodyStr, { status: response.status }),
bodyStr,
);
}
data = (await response.json()) as TokenResponse;

2
src/app/t.const.ts
View file

@ -1288,6 +1288,7 @@ const T = {
},
},
S: {
AUTH_SETUP_FAILED: 'F.SYNC.S.AUTH_SETUP_FAILED',
ALREADY_IN_SYNC: 'F.SYNC.S.ALREADY_IN_SYNC',
BTN_CONFIGURE: 'F.SYNC.S.BTN_CONFIGURE',
BTN_FORCE_OVERWRITE: 'F.SYNC.S.BTN_FORCE_OVERWRITE',
@ -1312,6 +1313,7 @@ const T = {
INCOMPLETE_OP_SYNC: 'F.SYNC.S.INCOMPLETE_OP_SYNC',
TOO_MANY_OPS_TO_DOWNLOAD: 'F.SYNC.S.TOO_MANY_OPS_TO_DOWNLOAD',
INITIAL_SYNC_ERROR: 'F.SYNC.S.INITIAL_SYNC_ERROR',
INVALID_AUTH_CODE: 'F.SYNC.S.INVALID_AUTH_CODE',
INVALID_OPERATION_PAYLOAD: 'F.SYNC.S.INVALID_OPERATION_PAYLOAD',
DECRYPTION_FAILED: 'F.SYNC.S.DECRYPTION_FAILED',
ENCRYPTION_PASSWORD_REQUIRED: 'F.SYNC.S.ENCRYPTION_PASSWORD_REQUIRED',

2
src/assets/i18n/en.json
View file

@ -1272,7 +1272,9 @@
"AUTH_TOKEN_REJECTED": "Sync token was rejected by the server: {{reason}}. Please get a new token.",
"INCOMPLETE_OP_SYNC": "Sync incomplete: {{count}} operation file(s) failed to download",
"TOO_MANY_OPS_TO_DOWNLOAD": "Too many sync operations to download. Some changes may be missing.",
"AUTH_SETUP_FAILED": "Failed to set up authentication. If you're using the web app, make sure you're accessing it over HTTPS. Otherwise, please try the stable version or report this as a bug.",
"INITIAL_SYNC_ERROR": "Initial Sync failed",
"INVALID_AUTH_CODE": "The authorization code was rejected. Please try authenticating again and make sure to copy the code exactly.",
"INVALID_OPERATION_PAYLOAD": "Invalid operation detected. Changes may not be saved - please reload.",
"DECRYPTION_FAILED": "Failed to decrypt synced data. Please check your encryption password.",
"ENCRYPTION_PASSWORD_REQUIRED": "Encrypted data received but no encryption password is configured. Please set your encryption password in sync settings.",