Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-21 20:16:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(server): add invalid oauth callback code error handling (#10603)

Browse Source 
close CLOUD-130
This commit is contained in:
fengmk2
2025-03-05 06:16:59 +00:00
parent 0b8fa7904d
commit b88113a2d1
6 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/server/src/plugins/oauth/providers/github.ts
+6 -4
View File
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import { Config, URLHelper } from '../../../base';
import { Config, InvalidOauthCallbackCode, URLHelper } from '../../../base';
import { OAuthProviderName } from '../config';
import { AutoRegisteredOAuthProvider } from '../register';
@@ -64,10 +64,12 @@ export class GithubOAuthProvider extends AutoRegisteredOAuthProvider {
scope: ghToken.scope,
};
} else {
const body = await response.text();
if (response.status < 500) {
throw new InvalidOauthCallbackCode({ status: response.status, body });
}
throw new Error(
`Server responded with non-success code ${
response.status
}, ${JSON.stringify(await response.json())}`
`Server responded with non-success status ${response.status}, body: ${body}`
);
}
}
packages/backend/server/src/plugins/oauth/providers/google.ts
+6 -4
View File
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import { Config, URLHelper } from '../../../base';
import { Config, InvalidOauthCallbackCode, URLHelper } from '../../../base';
import { OAuthProviderName } from '../config';
import { AutoRegisteredOAuthProvider } from '../register';
@@ -69,10 +69,12 @@ export class GoogleOAuthProvider extends AutoRegisteredOAuthProvider {
scope: ghToken.scope,
};
} else {
const body = await response.text();
if (response.status < 500) {
throw new InvalidOauthCallbackCode({ status: response.status, body });
}
throw new Error(
`Server responded with non-success code ${
response.status
}, ${JSON.stringify(await response.json())}`
`Server responded with non-success status ${response.status}, body: ${body}`
);
}
}