1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00

fix cyclic dependencies for AutoDiscoveryActionEnum

This commit is contained in:
Germain Souquet
2021-09-11 16:17:40 +01:00
parent 375b228bb2
commit edd614dd0c
2 changed files with 10 additions and 10 deletions

View File

@@ -17,13 +17,21 @@ limitations under the License.
/** @module auto-discovery */ /** @module auto-discovery */
import { IClientWellKnown, IWellKnownConfig, AutoDiscoveryAction } from "./client"; import { IClientWellKnown, IWellKnownConfig } from "./client";
import { logger } from './logger'; import { logger } from './logger';
import { URL as NodeURL } from "url"; import { URL as NodeURL } from "url";
// Dev note: Auto discovery is part of the spec. // Dev note: Auto discovery is part of the spec.
// See: https://matrix.org/docs/spec/client_server/r0.4.0.html#server-discovery // See: https://matrix.org/docs/spec/client_server/r0.4.0.html#server-discovery
export enum AutoDiscoveryAction {
SUCCESS = "SUCCESS",
IGNORE = "IGNORE",
PROMPT = "PROMPT",
FAIL_PROMPT = "FAIL_PROMPT",
FAIL_ERROR = "FAIL_ERROR",
}
/** /**
* Utilities for automatically discovery resources, such as homeservers * Utilities for automatically discovery resources, such as homeservers
* for users to log in to. * for users to log in to.

View File

@@ -31,7 +31,7 @@ import { sleep } from './utils';
import { Group } from "./models/group"; import { Group } from "./models/group";
import { Direction, EventTimeline } from "./models/event-timeline"; import { Direction, EventTimeline } from "./models/event-timeline";
import { IActionsObject, PushProcessor } from "./pushprocessor"; import { IActionsObject, PushProcessor } from "./pushprocessor";
import { AutoDiscovery } from "./autodiscovery"; import { AutoDiscovery, AutoDiscoveryAction } from "./autodiscovery";
import * as olmlib from "./crypto/olmlib"; import * as olmlib from "./crypto/olmlib";
import { decodeBase64, encodeBase64 } from "./crypto/olmlib"; import { decodeBase64, encodeBase64 } from "./crypto/olmlib";
import { IExportedDevice as IOlmDevice } from "./crypto/OlmDevice"; import { IExportedDevice as IOlmDevice } from "./crypto/OlmDevice";
@@ -490,14 +490,6 @@ export interface IWellKnownConfig {
base_url?: string | null; base_url?: string | null;
} }
export enum AutoDiscoveryAction {
SUCCESS = "SUCCESS",
IGNORE = "IGNORE",
PROMPT = "PROMPT",
FAIL_PROMPT = "FAIL_PROMPT",
FAIL_ERROR = "FAIL_ERROR",
}
interface IKeyBackupPath { interface IKeyBackupPath {
path: string; path: string;
queryData?: { queryData?: {