From a06ff72b7a0ea1997bbbd9512e1f75cc56c836b6 Mon Sep 17 00:00:00 2001 From: Laurens Rietveld Date: Tue, 26 Mar 2024 15:16:48 +0100 Subject: [PATCH] Fix circular references #879 (#880) Co-authored-by: Chris Barth --- src/multiSamlStrategy.ts | 2 +- src/strategy.ts | 2 +- src/types.ts | 2 +- test/multiSamlStrategy.spec.ts | 3 ++- test/strategy.spec.ts | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/multiSamlStrategy.ts b/src/multiSamlStrategy.ts index c2c18d2e..afe6b3fe 100644 --- a/src/multiSamlStrategy.ts +++ b/src/multiSamlStrategy.ts @@ -8,7 +8,7 @@ import { VerifyWithoutRequest, VerifyWithRequest, } from "./types"; -import { SAML } from "."; +import { SAML } from "@node-saml/node-saml"; export class MultiSamlStrategy extends AbstractStrategy { static readonly newSamlProviderOnConstruct = false; diff --git a/src/strategy.ts b/src/strategy.ts index 7ad81dad..51302312 100644 --- a/src/strategy.ts +++ b/src/strategy.ts @@ -1,7 +1,7 @@ import { Strategy as PassportStrategy } from "passport-strategy"; import { strict as assert } from "assert"; import * as url from "url"; -import { Profile, SAML } from "."; +import { Profile, SAML } from "@node-saml/node-saml"; import { PassportSamlConfig } from "./types"; import { AuthenticateOptions, diff --git a/src/types.ts b/src/types.ts index ff23f061..193e49f2 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,6 +1,6 @@ import type * as express from "express"; import * as passport from "passport"; -import { Profile, SamlConfig } from "."; +import { Profile, SamlConfig } from "@node-saml/node-saml"; export interface AuthenticateOptions extends passport.AuthenticateOptions { samlFallback?: "login-request" | "logout-request"; diff --git a/test/multiSamlStrategy.spec.ts b/test/multiSamlStrategy.spec.ts index e123ee24..74afa106 100644 --- a/test/multiSamlStrategy.spec.ts +++ b/test/multiSamlStrategy.spec.ts @@ -3,7 +3,8 @@ import * as express from "express"; import { Strategy } from "passport-strategy"; import * as sinon from "sinon"; import { expect } from "chai"; -import { MultiSamlStrategy, SAML, AbstractStrategy } from "../src"; +import { MultiSamlStrategy, AbstractStrategy } from "../src"; +import { SAML } from "@node-saml/node-saml"; import { MultiStrategyConfig, RequestWithUser, diff --git a/test/strategy.spec.ts b/test/strategy.spec.ts index f18003e5..b77f999f 100644 --- a/test/strategy.spec.ts +++ b/test/strategy.spec.ts @@ -3,7 +3,8 @@ import type * as express from "express"; import { expect } from "chai"; import * as sinon from "sinon"; -import { Profile, SAML, Strategy as SamlStrategy } from "../src"; +import { Strategy as SamlStrategy } from "../src"; +import { Profile, SAML } from "@node-saml/node-saml"; import { RequestWithUser, VerifiedCallback,