From 770718b972428795253d406068a1dddee57725ca Mon Sep 17 00:00:00 2001 From: Peter Lauck Date: Mon, 11 Dec 2023 15:32:55 +0000 Subject: [PATCH] feat(auth)!: move error matcher injection token to state subpackage (#2645) BREAKING CHANGE: error matcher injection token has moved to state subpackage --- libs/auth/routing/src/guards/guest-only.guard.ts | 10 +++++----- libs/auth/routing/src/guards/member-only.guard.ts | 10 +++++----- libs/auth/src/injection-tokens/public_api.ts | 1 - libs/auth/src/public_api.ts | 1 - libs/auth/state/src/effects/auth.effects.ts | 10 +++++----- libs/auth/state/src/effects/login.effects.ts | 2 +- libs/auth/state/src/effects/register.effects.ts | 2 +- libs/auth/state/src/effects/reset-password.effects.ts | 2 +- .../src/injection-tokens/error-matcher.token.ts | 0 libs/auth/state/src/injection-tokens/public_api.ts | 1 + 10 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 libs/auth/src/injection-tokens/public_api.ts rename libs/auth/{ => state}/src/injection-tokens/error-matcher.token.ts (100%) diff --git a/libs/auth/routing/src/guards/guest-only.guard.ts b/libs/auth/routing/src/guards/guest-only.guard.ts index bb071e729a..1d16fdd89d 100644 --- a/libs/auth/routing/src/guards/guest-only.guard.ts +++ b/libs/auth/routing/src/guards/guest-only.guard.ts @@ -17,16 +17,16 @@ import { tap, } from 'rxjs/operators'; -import { - DAFF_AUTH_ERROR_MATCHER, - DaffAuthStorageService, -} from '@daffodil/auth'; +import { DaffAuthStorageService } from '@daffodil/auth'; import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, DaffAuthDriverErrorCodes, DaffAuthDriverTokenCheck, } from '@daffodil/auth/driver'; -import { DaffAuthGuardLogout } from '@daffodil/auth/state'; +import { + DAFF_AUTH_ERROR_MATCHER, + DaffAuthGuardLogout, +} from '@daffodil/auth/state'; import { DaffError } from '@daffodil/core'; import { ErrorTransformer } from '@daffodil/core/state'; diff --git a/libs/auth/routing/src/guards/member-only.guard.ts b/libs/auth/routing/src/guards/member-only.guard.ts index dd600f8840..6c28588fae 100644 --- a/libs/auth/routing/src/guards/member-only.guard.ts +++ b/libs/auth/routing/src/guards/member-only.guard.ts @@ -17,16 +17,16 @@ import { tap, } from 'rxjs/operators'; -import { - DAFF_AUTH_ERROR_MATCHER, - DaffAuthStorageService, -} from '@daffodil/auth'; +import { DaffAuthStorageService } from '@daffodil/auth'; import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, DaffAuthDriverErrorCodes, DaffAuthDriverTokenCheck, } from '@daffodil/auth/driver'; -import { DaffAuthGuardLogout } from '@daffodil/auth/state'; +import { + DAFF_AUTH_ERROR_MATCHER, + DaffAuthGuardLogout, +} from '@daffodil/auth/state'; import { DaffError } from '@daffodil/core'; import { ErrorTransformer } from '@daffodil/core/state'; diff --git a/libs/auth/src/injection-tokens/public_api.ts b/libs/auth/src/injection-tokens/public_api.ts deleted file mode 100644 index 7030ffaf5d..0000000000 --- a/libs/auth/src/injection-tokens/public_api.ts +++ /dev/null @@ -1 +0,0 @@ -export { DAFF_AUTH_ERROR_MATCHER } from './error-matcher.token'; diff --git a/libs/auth/src/public_api.ts b/libs/auth/src/public_api.ts index 076f98d8f0..1b177681dc 100644 --- a/libs/auth/src/public_api.ts +++ b/libs/auth/src/public_api.ts @@ -1,5 +1,4 @@ export { DaffAuthStorageService } from './storage/auth-storage.service'; export * from './models/public_api'; -export * from './injection-tokens/public_api'; export * from './errors/public_api'; diff --git a/libs/auth/state/src/effects/auth.effects.ts b/libs/auth/state/src/effects/auth.effects.ts index c2d7b36625..d3b7ab4c09 100644 --- a/libs/auth/state/src/effects/auth.effects.ts +++ b/libs/auth/state/src/effects/auth.effects.ts @@ -20,10 +20,7 @@ import { tap, } from 'rxjs/operators'; -import { - DaffAuthStorageService, - DAFF_AUTH_ERROR_MATCHER, -} from '@daffodil/auth'; +import { DaffAuthStorageService } from '@daffodil/auth'; import { DAFF_AUTH_UNAUTHENTICATED_ERROR_CODES, DaffAuthDriverTokenCheck, @@ -55,7 +52,10 @@ import { DaffAuthStateConfig, DAFF_AUTH_STATE_CONFIG, } from '../config/public_api'; -import { DaffAuthUnauthenticatedHook } from '../injection-tokens/public_api'; +import { + DAFF_AUTH_ERROR_MATCHER, + DaffAuthUnauthenticatedHook, +} from '../injection-tokens/public_api'; import { DAFF_AUTH_UNAUTHENTICATED_HOOK } from '../injection-tokens/unauthenticated/hook.token'; @Injectable() diff --git a/libs/auth/state/src/effects/login.effects.ts b/libs/auth/state/src/effects/login.effects.ts index fb125d67a7..7c660db218 100644 --- a/libs/auth/state/src/effects/login.effects.ts +++ b/libs/auth/state/src/effects/login.effects.ts @@ -18,7 +18,6 @@ import { import { DaffLoginInfo, DaffAuthToken, - DAFF_AUTH_ERROR_MATCHER, DaffAuthStorageService, } from '@daffodil/auth'; import { @@ -43,6 +42,7 @@ import { DaffAuthLoginActions, DaffAuthStorageFailure, } from '../actions/public_api'; +import { DAFF_AUTH_ERROR_MATCHER } from '../injection-tokens/public_api'; @Injectable() export class DaffAuthLoginEffects< diff --git a/libs/auth/state/src/effects/register.effects.ts b/libs/auth/state/src/effects/register.effects.ts index 45670b99ee..76784069b1 100644 --- a/libs/auth/state/src/effects/register.effects.ts +++ b/libs/auth/state/src/effects/register.effects.ts @@ -23,7 +23,6 @@ import { import { DaffAccountRegistration, DaffAuthStorageService, - DAFF_AUTH_ERROR_MATCHER, } from '@daffodil/auth'; import { DaffRegisterDriver, @@ -44,6 +43,7 @@ import { DaffAuthStorageFailure, DaffAuthRegisterActions, } from '../actions/public_api'; +import { DAFF_AUTH_ERROR_MATCHER } from '../injection-tokens/public_api'; @Injectable() export class DaffAuthRegisterEffects< diff --git a/libs/auth/state/src/effects/reset-password.effects.ts b/libs/auth/state/src/effects/reset-password.effects.ts index 4bec77f34b..bb4b1de586 100644 --- a/libs/auth/state/src/effects/reset-password.effects.ts +++ b/libs/auth/state/src/effects/reset-password.effects.ts @@ -21,7 +21,6 @@ import { } from 'rxjs/operators'; import { - DAFF_AUTH_ERROR_MATCHER, DaffAuthResetPasswordInfo, DaffAuthStorageService, } from '@daffodil/auth'; @@ -47,6 +46,7 @@ import { DaffAuthServerSide, DaffAuthStorageFailure, } from '../actions/public_api'; +import { DAFF_AUTH_ERROR_MATCHER } from '../injection-tokens/public_api'; @Injectable() export class DaffAuthResetPasswordEffects< diff --git a/libs/auth/src/injection-tokens/error-matcher.token.ts b/libs/auth/state/src/injection-tokens/error-matcher.token.ts similarity index 100% rename from libs/auth/src/injection-tokens/error-matcher.token.ts rename to libs/auth/state/src/injection-tokens/error-matcher.token.ts diff --git a/libs/auth/state/src/injection-tokens/public_api.ts b/libs/auth/state/src/injection-tokens/public_api.ts index cd1867fa50..aeffb4699c 100644 --- a/libs/auth/state/src/injection-tokens/public_api.ts +++ b/libs/auth/state/src/injection-tokens/public_api.ts @@ -1 +1,2 @@ export * from './unauthenticated/public_api'; +export { DAFF_AUTH_ERROR_MATCHER } from './error-matcher.token';