From 1dfe79b8bd29a17c858c005e3d4ec06bbe96afd3 Mon Sep 17 00:00:00 2001
From: Sinan997 <sinanozturk997@gmail.com>
Date: Thu, 4 Apr 2024 18:32:18 +0300
Subject: [PATCH] remove `LocalStorageListenerService` service from `oauth
 package` and move to the `core package`

---
 npm/ng-packs/packages/core/src/lib/core.module.ts         | 7 +++++++
 npm/ng-packs/packages/core/src/lib/services/index.ts      | 3 ++-
 .../src/lib/services/local-storage-listener.service.ts    | 4 +---
 npm/ng-packs/packages/oauth/src/lib/oauth.module.ts       | 8 +-------
 npm/ng-packs/packages/oauth/src/lib/services/index.ts     | 1 -
 5 files changed, 11 insertions(+), 12 deletions(-)
 rename npm/ng-packs/packages/{oauth => core}/src/lib/services/local-storage-listener.service.ts (73%)

diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts
index 9637ad6847..eb475074ce 100644
--- a/npm/ng-packs/packages/core/src/lib/core.module.ts
+++ b/npm/ng-packs/packages/core/src/lib/core.module.ts
@@ -43,6 +43,7 @@ import { AuthErrorFilterService } from './abstracts';
 import { DYNAMIC_LAYOUTS_TOKEN } from "./tokens/dynamic-layout.token";
 import { DEFAULT_DYNAMIC_LAYOUTS } from "./constants";
 import { AbpTitleStrategy } from './services/title-strategy.service';
+import { LocalStorageListenerService } from './services/local-storage-listener.service';
 
 
 const standaloneDirectives = [
@@ -164,6 +165,12 @@ export class CoreModule {
           deps: [LocalizationService],
           useFactory: noop,
         },
+        {
+          provide: APP_INITIALIZER,
+          multi: true,
+          deps: [LocalStorageListenerService],
+          useFactory: noop,
+        },
         {
           provide: APP_INITIALIZER,
           multi: true,
diff --git a/npm/ng-packs/packages/core/src/lib/services/index.ts b/npm/ng-packs/packages/core/src/lib/services/index.ts
index 5d3e9d6d1e..354088e019 100644
--- a/npm/ng-packs/packages/core/src/lib/services/index.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/index.ts
@@ -20,4 +20,5 @@ export * from './subscription.service';
 export * from './track-by.service';
 export * from './local-storage.service';
 export * from './window.service';
-export * from './internet-connection-service'
\ No newline at end of file
+export * from './internet-connection-service'
+export * from './local-storage-listener.service'
\ No newline at end of file
diff --git a/npm/ng-packs/packages/oauth/src/lib/services/local-storage-listener.service.ts b/npm/ng-packs/packages/core/src/lib/services/local-storage-listener.service.ts
similarity index 73%
rename from npm/ng-packs/packages/oauth/src/lib/services/local-storage-listener.service.ts
rename to npm/ng-packs/packages/core/src/lib/services/local-storage-listener.service.ts
index 7c267c285b..67231f5e85 100644
--- a/npm/ng-packs/packages/oauth/src/lib/services/local-storage-listener.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/local-storage-listener.service.ts
@@ -1,18 +1,16 @@
 import { DOCUMENT } from '@angular/common';
 import { Injectable, inject } from '@angular/core';
-import { OAuthService } from 'angular-oauth2-oidc';
 
 @Injectable({
   providedIn: 'root',
 })
 export class LocalStorageListenerService {
   protected readonly window = inject(DOCUMENT).defaultView;
-  protected readonly authService = inject(OAuthService);
 
   constructor() {
     this.window.addEventListener('storage', event => {
       if (event.key === 'access_token' && event.newValue === null) {
-        this.authService.logOut();
+        this.window.location.reload();
       }
     });
   }
diff --git a/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts b/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts
index 6f5830e938..2adac2a23a 100644
--- a/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/oauth.module.ts
@@ -13,7 +13,7 @@ import {
   noop,
   PIPE_TO_LOGIN_FN_KEY,
 } from '@abp/ng.core';
-import { AbpOAuthService, LocalStorageListenerService, OAuthErrorFilterService } from './services';
+import { AbpOAuthService, OAuthErrorFilterService } from './services';
 import { OAuthConfigurationHandler } from './handlers/oauth-configuration.handler';
 import { OAuthApiInterceptor } from './interceptors/api.interceptor';
 import { AbpOAuthGuard, abpOAuthGuard } from './guards/oauth.guard';
@@ -64,12 +64,6 @@ export class AbpOAuthModule {
           deps: [OAuthConfigurationHandler],
           useFactory: noop,
         },
-        {
-          provide: APP_INITIALIZER,
-          multi: true,
-          deps: [LocalStorageListenerService],
-          useFactory: noop,
-        },
         OAuthModule.forRoot().providers as Provider[],
         { provide: OAuthStorage, useClass: AbpLocalStorageService },
         { provide: AuthErrorFilterService, useExisting: OAuthErrorFilterService },
diff --git a/npm/ng-packs/packages/oauth/src/lib/services/index.ts b/npm/ng-packs/packages/oauth/src/lib/services/index.ts
index 204a156e98..375177f3b5 100644
--- a/npm/ng-packs/packages/oauth/src/lib/services/index.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/services/index.ts
@@ -1,3 +1,2 @@
 export * from './oauth.service';
 export * from './oauth-error-filter.service';
-export * from './local-storage-listener.service';