1
0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-18 17:23:27 +00:00

EC-134 Fix api token refresh (#257)

* Fix api token refresh

* Update jslib
This commit is contained in:
Thomas Rittson
2022-04-01 14:48:35 +10:00
committed by GitHub
parent c75d26b618
commit 8981b97632
4 changed files with 14 additions and 59 deletions

View File

@@ -30,7 +30,6 @@ import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunctio
import { StateService as StateServiceAbstraction } from "../../abstractions/state.service";
import { Account } from "../../models/account";
import { refreshToken } from "../../services/api.service";
import { AuthService } from "../../services/auth.service";
import { I18nService } from "../../services/i18n.service";
import { NoopTwoFactorService } from "../../services/noop/noopTwoFactor.service";
@@ -41,14 +40,6 @@ import { SyncService } from "../../services/sync.service";
import { AuthGuardService } from "./auth-guard.service";
import { LaunchGuardService } from "./launch-guard.service";
function refreshTokenCallback(injector: Injector) {
return () => {
const stateService = injector.get(StateServiceAbstraction);
const authService = injector.get(AuthServiceAbstraction);
return refreshToken(stateService, authService);
};
}
export function initFactory(
environmentService: EnvironmentServiceAbstraction,
i18nService: I18nService,
@@ -129,26 +120,26 @@ export function initFactory(
platformUtilsService: PlatformUtilsServiceAbstraction,
environmentService: EnvironmentServiceAbstraction,
messagingService: MessagingServiceAbstraction,
injector: Injector
appIdService: AppIdServiceAbstraction
) =>
new NodeApiService(
tokenService,
platformUtilsService,
environmentService,
appIdService,
async (expired: boolean) => messagingService.send("logout", { expired: expired }),
"Bitwarden_DC/" +
platformUtilsService.getApplicationVersion() +
" (" +
platformUtilsService.getDeviceString().toUpperCase() +
")",
refreshTokenCallback(injector)
")"
),
deps: [
TokenServiceAbstraction,
PlatformUtilsServiceAbstraction,
EnvironmentServiceAbstraction,
MessagingServiceAbstraction,
Injector,
AppIdServiceAbstraction,
],
},
{