1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-14 15:33:55 +00:00

switch dependency injection to next achievement service

This commit is contained in:
✨ Audrey ✨
2025-03-20 21:27:31 -04:00
parent a253bf2737
commit 1a6cc6b4eb
5 changed files with 35 additions and 129 deletions

View File

@@ -247,10 +247,10 @@ import { AuditService } from "@bitwarden/common/services/audit.service";
import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service";
import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service";
import { SearchService } from "@bitwarden/common/services/search.service";
import { AchievementService as AchievementServiceAbstraction } from "@bitwarden/common/tools/achievements/achievement.service.abstraction";
import { EventStore } from "@bitwarden/common/tools/achievements/event-store";
import { EventStoreAbstraction } from "@bitwarden/common/tools/achievements/event-store.abstraction.service";
import { HubAchievementService } from "@bitwarden/common/tools/achievements/hub-achievement.service";
import { AchievementService } from "@bitwarden/common/tools/achievements/achievement.service.abstraction";
import { NextAchievementService } from "@bitwarden/common/tools/achievements/next-achievement.service";
import { DefaultUserEventCollector } from "@bitwarden/common/tools/log/default-user-event-collector";
import { UserEventCollector } from "@bitwarden/common/tools/log/user-event-collector";
import {
PasswordStrengthService,
PasswordStrengthServiceAbstraction,
@@ -359,7 +359,6 @@ import {
ENV_ADDITIONAL_REGIONS,
} from "./injection-tokens";
import { ModalService } from "./modal.service";
import { AchievementHub } from "@bitwarden/common/tools/achievements/achievement-hub";
/**
* Provider definitions used in the ngModule.
@@ -1498,21 +1497,21 @@ const safeProviders: SafeProvider[] = [
],
}),
safeProvider({
provide: EventStoreAbstraction,
useClass: EventStore,
deps: [],
provide: UserEventCollector,
useClass: DefaultUserEventCollector,
deps: [AppIdServiceAbstraction, PlatformUtilsServiceAbstraction],
}),
safeProvider({
provide: AchievementServiceAbstraction,
useClass: HubAchievementService,
deps: [],
provide: AchievementService,
useClass: NextAchievementService,
deps: [UserEventCollector],
}),
safeProvider({
provide: AchievementNotifierServiceAbstraction,
useClass: AchievementNotifierService,
deps: [
AccountServiceAbstraction,
AchievementServiceAbstraction,
AchievementService,
PlatformUtilsServiceAbstraction,
I18nServiceAbstraction,
ToastService,

View File

@@ -3,7 +3,7 @@ import { concat, filter, map, mergeAll, switchMap } from "rxjs";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { NextAchievementService } from "@bitwarden/common/tools/achievements/next-achievement.service";
import { AchievementService } from "@bitwarden/common/tools/achievements/achievement.service.abstraction";
import { Achievement } from "@bitwarden/common/tools/achievements/types";
import { UserId } from "@bitwarden/common/types/guid";
import { Icon, ToastService } from "@bitwarden/components";
@@ -15,7 +15,7 @@ import { iconMap } from "./icons/iconMap";
export class AchievementNotifierService implements AchievementNotifierServiceAbstraction {
constructor(
private accountService: AccountService,
private achievementService: NextAchievementService,
private achievementService: AchievementService,
private platformUtilsService: PlatformUtilsService,
private i18nService: I18nService,
private toastService: ToastService,