Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions src/scripture-forge/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import papi, { logger } from '@papi/backend';
import { ExecutionActivationContext, IWebViewProvider } from '@papi/core';
import { formatReplacementString, isString } from 'platform-bible-utils';
import { formatReplacementString, isPlatformError, isString } from 'platform-bible-utils';
import ScriptureForgeAuthenticationProvider, {
AUTH_PATH,
} from './auth/scripture-forge-authentication-provider.model';
Expand Down Expand Up @@ -155,13 +155,21 @@ export async function activate(context: ExecutionActivationContext) {
const updateServerConfigurationSubscriptionPromise = papi.settings.subscribe(
'scriptureForge.serverConfiguration',
(newServerConfiguration) => {
if (isPlatformError(newServerConfiguration)) {
logger.warn(`Error on getting new SF server configuration: ${newServerConfiguration}`);
return;
}

authenticationProvider.serverConfiguration = newServerConfiguration;
},
{ retrieveDataImmediately: false },
);

const loginCommandPromise = papi.commands.registerCommand('scriptureForge.login', () =>
authenticationProvider.login(),
const loginCommandPromise = papi.commands.registerCommand(
'scriptureForge.login',
() => authenticationProvider.login(),
undefined,
{ timeoutMilliseconds: 0 },
);

const logoutCommandPromise = papi.commands.registerCommand('scriptureForge.logout', () =>
Expand Down