mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-12 12:28:42 +00:00
fix: ws prefix url in electron (#1896)
This commit is contained in:
@@ -167,9 +167,16 @@ export function createAffineAuth(prefix = '/') {
|
||||
}
|
||||
let provider: AuthProvider;
|
||||
switch (method) {
|
||||
case SignMethod.Google:
|
||||
provider = new GoogleAuthProvider();
|
||||
case SignMethod.Google: {
|
||||
const googleProvider = new GoogleAuthProvider();
|
||||
// make sure the user has a chance to select an account
|
||||
// https://developers.google.com/identity/openid-connect/openid-connect#prompt
|
||||
googleProvider.setCustomParameters({
|
||||
prompt: 'select_account',
|
||||
});
|
||||
provider = googleProvider;
|
||||
break;
|
||||
}
|
||||
case SignMethod.GitHub:
|
||||
provider = new GithubAuthProvider();
|
||||
break;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { DebugLogger } from '@affine/debug';
|
||||
import { websocketPrefixUrl } from '@affine/env/api';
|
||||
import {
|
||||
workspaceDetailSchema,
|
||||
workspaceSchema,
|
||||
@@ -61,11 +62,7 @@ export function createAffineGlobalChannel(
|
||||
let dispose: Disposable | undefined = undefined;
|
||||
const apis = {
|
||||
connect: () => {
|
||||
client = new WebsocketClient(
|
||||
`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${
|
||||
window.location.host
|
||||
}/api/global/sync`
|
||||
);
|
||||
client = new WebsocketClient(websocketPrefixUrl + '/api/global/sync/');
|
||||
client.connect(handleMessage);
|
||||
dispose = storageChangeSlot.on(() => {
|
||||
apis.disconnect();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { config } from '@affine/env';
|
||||
import { config, websocketPrefixUrl } from '@affine/env';
|
||||
import { KeckProvider } from '@affine/workspace/affine/keck';
|
||||
import {
|
||||
getLoginStorage,
|
||||
@@ -41,11 +41,8 @@ const createAffineWebSocketProvider = (
|
||||
apis.disconnect();
|
||||
apis.connect();
|
||||
});
|
||||
const wsUrl = `${
|
||||
window.location.protocol === 'https:' ? 'wss' : 'ws'
|
||||
}://${window.location.host}/api/sync/`;
|
||||
webSocketProvider = new KeckProvider(
|
||||
wsUrl,
|
||||
websocketPrefixUrl + '/api/sync/',
|
||||
blockSuiteWorkspace.id,
|
||||
blockSuiteWorkspace.doc,
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user