@medrunner/api-client 0.2.7 → 0.3.0

package/dist/index.d.mts

@@ -40,6 +40,15 @@ interface ApiConfig {
     baseUrl?: string;
     accessToken?: string;
     refreshToken?: string;
+    cookieAuth?: boolean;
+}
+
+declare class DefaultApiConfig {
+    readonly baseUrl: string;
+    readonly accessToken?: string;
+    readonly refreshToken?: string;
+    readonly cookieAuth: boolean;
+    constructor(config: ApiConfig);
 }
 
 declare class TokenManager extends ApiEndpoint {
@@ -49,7 +58,7 @@ declare class TokenManager extends ApiEndpoint {
     private accessTokenExpiration?;
     private refreshTokenExpiration?;
     private tokenFetchPromise?;
-    constructor(config: ApiConfig, refreshCallback?: AsyncAction<TokenGrant> | undefined, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, refreshCallback?: AsyncAction<TokenGrant> | undefined, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getAccessToken(source?: string): Promise<string | undefined>;
     private fetchToken;
@@ -59,8 +68,8 @@ declare abstract class ApiEndpoint {
     readonly tokenManager: TokenManager;
     protected readonly log?: Logger | undefined;
     private readonly headerProvider?;
-    readonly baseUrl: string;
-    protected constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger | undefined, headerProvider?: HeaderProvider | undefined);
+    readonly config: DefaultApiConfig;
+    protected constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger | undefined, headerProvider?: HeaderProvider | undefined);
     protected abstract endpoint(): string;
     protected endpointUrl(): string;
     private headersForRequest;
@@ -89,7 +98,7 @@ interface SignOutRequest {
 }
 
 declare class AuthEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     signOut(oldToken: SignOutRequest): Promise<ApiResponse>;
     getApiTokens(): Promise<ApiResponse<ApiToken[]>>;
@@ -115,7 +124,7 @@ interface ChatMessageRequest {
 }
 
 declare class ChatMessageEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getHistory(emergencyId: string, limit: number, paginationToken?: string): Promise<ApiResponse<PaginatedResponse<ChatMessage>>>;
     sendMessage(message: ChatMessageRequest): Promise<ApiResponse<ChatMessage>>;
@@ -188,7 +197,7 @@ declare enum CodeType {
 }
 
 declare class ClientEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     get(): Promise<ApiResponse<Person>>;
     getHistory(limit: number, paginationToken?: string): Promise<ApiResponse<PaginatedResponse<ClientHistory>>>;
@@ -200,7 +209,7 @@ declare class ClientEndpoint extends ApiEndpoint {
 }
 
 declare class CodeEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     redeem(code: string): Promise<ApiResponse>;
 }
@@ -420,7 +429,7 @@ interface ResponderDetails {
 }
 
 declare class EmergencyEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getEmergency(id: string): Promise<ApiResponse<Emergency>>;
     getEmergencies(ids: string[]): Promise<ApiResponse<Emergency[]>>;
@@ -474,7 +483,7 @@ declare enum ServiceStatus {
 }
 
 declare class OrgSettingsEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getPublicSettings(): Promise<ApiResponse<PublicOrgSettings>>;
 }
@@ -485,13 +494,13 @@ interface MedalInformation {
 }
 
 declare class StaffEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     medalsInformation(): Promise<ApiResponse<MedalInformation[]>>;
 }
 
 declare class WebsocketEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     private websocketManager;
     protected endpoint(): string;
     initialize(): Promise<HubConnection>;

package/dist/index.d.ts

@@ -40,6 +40,15 @@ interface ApiConfig {
     baseUrl?: string;
     accessToken?: string;
     refreshToken?: string;
+    cookieAuth?: boolean;
+}
+
+declare class DefaultApiConfig {
+    readonly baseUrl: string;
+    readonly accessToken?: string;
+    readonly refreshToken?: string;
+    readonly cookieAuth: boolean;
+    constructor(config: ApiConfig);
 }
 
 declare class TokenManager extends ApiEndpoint {
@@ -49,7 +58,7 @@ declare class TokenManager extends ApiEndpoint {
     private accessTokenExpiration?;
     private refreshTokenExpiration?;
     private tokenFetchPromise?;
-    constructor(config: ApiConfig, refreshCallback?: AsyncAction<TokenGrant> | undefined, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, refreshCallback?: AsyncAction<TokenGrant> | undefined, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getAccessToken(source?: string): Promise<string | undefined>;
     private fetchToken;
@@ -59,8 +68,8 @@ declare abstract class ApiEndpoint {
     readonly tokenManager: TokenManager;
     protected readonly log?: Logger | undefined;
     private readonly headerProvider?;
-    readonly baseUrl: string;
-    protected constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger | undefined, headerProvider?: HeaderProvider | undefined);
+    readonly config: DefaultApiConfig;
+    protected constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger | undefined, headerProvider?: HeaderProvider | undefined);
     protected abstract endpoint(): string;
     protected endpointUrl(): string;
     private headersForRequest;
@@ -89,7 +98,7 @@ interface SignOutRequest {
 }
 
 declare class AuthEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     signOut(oldToken: SignOutRequest): Promise<ApiResponse>;
     getApiTokens(): Promise<ApiResponse<ApiToken[]>>;
@@ -115,7 +124,7 @@ interface ChatMessageRequest {
 }
 
 declare class ChatMessageEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getHistory(emergencyId: string, limit: number, paginationToken?: string): Promise<ApiResponse<PaginatedResponse<ChatMessage>>>;
     sendMessage(message: ChatMessageRequest): Promise<ApiResponse<ChatMessage>>;
@@ -188,7 +197,7 @@ declare enum CodeType {
 }
 
 declare class ClientEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     get(): Promise<ApiResponse<Person>>;
     getHistory(limit: number, paginationToken?: string): Promise<ApiResponse<PaginatedResponse<ClientHistory>>>;
@@ -200,7 +209,7 @@ declare class ClientEndpoint extends ApiEndpoint {
 }
 
 declare class CodeEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     redeem(code: string): Promise<ApiResponse>;
 }
@@ -420,7 +429,7 @@ interface ResponderDetails {
 }
 
 declare class EmergencyEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getEmergency(id: string): Promise<ApiResponse<Emergency>>;
     getEmergencies(ids: string[]): Promise<ApiResponse<Emergency[]>>;
@@ -474,7 +483,7 @@ declare enum ServiceStatus {
 }
 
 declare class OrgSettingsEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     getPublicSettings(): Promise<ApiResponse<PublicOrgSettings>>;
 }
@@ -485,13 +494,13 @@ interface MedalInformation {
 }
 
 declare class StaffEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     protected endpoint(): string;
     medalsInformation(): Promise<ApiResponse<MedalInformation[]>>;
 }
 
 declare class WebsocketEndpoint extends ApiEndpoint {
-    constructor(baseUrl: string | undefined, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
+    constructor(config: DefaultApiConfig, tokenManager: TokenManager, log?: Logger, headerProvider?: HeaderProvider);
     private websocketManager;
     protected endpoint(): string;
     initialize(): Promise<HubConnection>;

package/dist/index.js

@@ -65,23 +65,24 @@ module.exports = __toCommonJS(src_exports);
 // src/api/endpoints/ApiEndpoint.ts
 var import_axios = __toESM(require("axios"));
 var ApiEndpoint = class {
-  constructor(baseUrl, tokenManager, log, headerProvider) {
+  constructor(config, tokenManager, log, headerProvider) {
     this.tokenManager = tokenManager;
     this.log = log;
     this.headerProvider = headerProvider;
-    this.baseUrl = baseUrl ?? "https://api.medrunner.space";
+    this.config = config;
   }
   static {
     __name(this, "ApiEndpoint");
   }
-  baseUrl;
+  config;
   endpointUrl() {
-    return `${this.baseUrl}/${this.endpoint()}`;
+    return `${this.config.baseUrl}/${this.endpoint()}`;
   }
   async headersForRequest(noAuthentication) {
     const config = {
-      baseURL: this.baseUrl,
-      headers: {}
+      baseURL: this.config.baseUrl,
+      headers: {},
+      withCredentials: this.config.cookieAuth
     };
     if (config.headers !== void 0) {
       if (!noAuthentication) {
@@ -163,8 +164,8 @@ var AuthEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "AuthEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
     return "auth";
@@ -214,7 +215,7 @@ var AuthEndpoint = class extends ApiEndpoint {
 // src/api/endpoints/auth/TokenManager.ts
 var TokenManager = class extends ApiEndpoint {
   constructor(config, refreshCallback, log, headerProvider) {
-    super(config.baseUrl, null, log, headerProvider);
+    super(config, null, log, headerProvider);
     this.refreshCallback = refreshCallback;
     this.accessToken = config.accessToken;
     this.refreshToken = config.refreshToken;
@@ -232,15 +233,19 @@ var TokenManager = class extends ApiEndpoint {
   }
   async getAccessToken(source = "unknown") {
     this.log?.debug(`getAccessToken: New token requested from ${source}`);
-    if (this.accessToken !== void 0 && this.accessTokenExpiration !== void 0) {
+    if ((this.accessToken !== void 0 || this.config.cookieAuth) && this.accessTokenExpiration !== void 0) {
       const exp = Math.trunc(new Date(this.accessTokenExpiration).getTime() / 1e3);
       const now = Math.trunc(Date.now() / 1e3);
       if (exp - 300 > now) {
         this.log?.debug(`getAccessToken: ${source} => Token valid and simply returned`);
-        return this.accessToken;
+        if (!this.config.cookieAuth) {
+          return this.accessToken;
+        } else {
+          return void 0;
+        }
       }
     }
-    if (this.refreshToken === void 0) {
+    if (this.refreshToken === void 0 && !this.config.cookieAuth) {
       this.log?.debug(`getAccessToken: ${source} => Missing refresh token, returning stored access token`);
       return this.accessToken;
     }
@@ -251,9 +256,11 @@ var TokenManager = class extends ApiEndpoint {
     try {
       this.log?.debug(`getAccessToken: ${source} => Waiting for token fetch to complete`);
       const tokens = await this.tokenFetchPromise;
-      this.log?.debug(`getAccessToken: ${source} => Setting new tokens in memory`);
-      this.accessToken = tokens.accessToken;
-      this.refreshToken = tokens.refreshToken;
+      this.log?.debug(`getAccessToken: ${source} => Setting new tokens in memory if no cookieAuth`);
+      if (!this.config.cookieAuth) {
+        this.accessToken = tokens.accessToken;
+        this.refreshToken = tokens.refreshToken;
+      }
       this.accessTokenExpiration = tokens.accessTokenExpiration;
       if (tokens.refreshTokenExpiration) this.refreshTokenExpiration = tokens.refreshTokenExpiration;
       if (this.refreshCallback !== void 0) {
@@ -264,11 +271,16 @@ var TokenManager = class extends ApiEndpoint {
       this.tokenFetchPromise = void 0;
     }
     this.log?.debug(`getAccessToken: ${source} => Returning new access token`);
-    return this.accessToken;
+    if (!this.config.cookieAuth) {
+      return this.accessToken;
+    } else {
+      return void 0;
+    }
   }
   async fetchToken(refreshToken, source = "unknown") {
     this.log?.debug(`getAccessToken: ${source} => Fetching new tokens`);
-    const result = await this.postRequest("/exchange", { refreshToken }, true);
+    const body = this.config.cookieAuth ? void 0 : { refreshToken };
+    const result = await this.postRequest("/exchange", body, true);
     if (!result.success || result.data === void 0) {
       throw Error(result.statusCode?.toString());
     }
@@ -282,8 +294,8 @@ var ChatMessageEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "ChatMessageEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
     return "chatMessage";
@@ -315,8 +327,8 @@ var ClientEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "ClientEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
     return "client";
@@ -383,8 +395,8 @@ var CodeEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "CodeEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
     return "code";
@@ -399,13 +411,30 @@ var CodeEndpoint = class extends ApiEndpoint {
   }
 };
 
+// src/api/endpoints/DefaultApiConfig.ts
+var DefaultApiConfig = class {
+  static {
+    __name(this, "DefaultApiConfig");
+  }
+  baseUrl;
+  accessToken;
+  refreshToken;
+  cookieAuth;
+  constructor(config) {
+    this.baseUrl = config.baseUrl ?? "https://api.medrunner.space";
+    this.accessToken = config.accessToken;
+    this.refreshToken = config.refreshToken;
+    this.cookieAuth = config.cookieAuth ?? false;
+  }
+};
+
 // src/api/endpoints/emergency/EmergencyEndpoint.ts
 var EmergencyEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "EmergencyEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
     return "emergency";
@@ -489,11 +518,11 @@ var OrgSettingsEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "OrgSettingsEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
-    return "orgsettings";
+    return "orgSettings";
   }
   /**
    * Get the public org settings.
@@ -509,8 +538,8 @@ var StaffEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "StaffEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
   endpoint() {
     return "staff";
@@ -553,8 +582,8 @@ var WSLogger = class {
   }
 };
 var WebsocketManager = class {
-  constructor(baseUrl, tokenManager, logger) {
-    this.baseUrl = baseUrl;
+  constructor(config, tokenManager, logger) {
+    this.config = config;
     this.tokenManager = tokenManager;
     this.logger = logger;
   }
@@ -566,8 +595,9 @@ var WebsocketManager = class {
   async establishConnection() {
     return new import_signalr.HubConnectionBuilder().withAutomaticReconnect({
       nextRetryDelayInMilliseconds: /* @__PURE__ */ __name((retryContext) => retryContext.previousRetryCount > 5 ? null : 2e3, "nextRetryDelayInMilliseconds")
-    }).withUrl(`${this.baseUrl}/hub/emergency`, {
-      accessTokenFactory: /* @__PURE__ */ __name(async () => await this.tokenManager.getAccessToken("WS accessTokenFactory") ?? "", "accessTokenFactory")
+    }).withUrl(`${this.config.baseUrl}/hub/emergency`, {
+      withCredentials: this.config.cookieAuth,
+      accessTokenFactory: this.config.cookieAuth ? async () => await this.tokenManager.getAccessToken("WS accessTokenFactory") ?? "" : void 0
     }).configureLogging(new WSLogger(this.logger)).build();
   }
 };
@@ -577,10 +607,10 @@ var WebsocketEndpoint = class extends ApiEndpoint {
   static {
     __name(this, "WebsocketEndpoint");
   }
-  constructor(baseUrl, tokenManager, log, headerProvider) {
-    super(baseUrl, tokenManager, log, headerProvider);
+  constructor(config, tokenManager, log, headerProvider) {
+    super(config, tokenManager, log, headerProvider);
   }
-  websocketManager = new WebsocketManager(this.baseUrl, this.tokenManager, this.log);
+  websocketManager = new WebsocketManager(this.config, this.tokenManager, this.log);
   endpoint() {
     return "websocket";
   }
@@ -619,16 +649,17 @@ var MedrunnerApiClient = class _MedrunnerApiClient {
    * @param log - A logger which logs request details
    * */
   static buildClient(config, refreshCallback, log) {
-    const tokenManager = new TokenManager(config, refreshCallback, log);
+    const configWithDefaults = new DefaultApiConfig(config);
+    const tokenManager = new TokenManager(configWithDefaults, refreshCallback, log);
     return new _MedrunnerApiClient(
-      new EmergencyEndpoint(config.baseUrl, tokenManager, log),
-      new ClientEndpoint(config.baseUrl, tokenManager, log),
-      new StaffEndpoint(config.baseUrl, tokenManager, log),
-      new OrgSettingsEndpoint(config.baseUrl, tokenManager, log),
-      new ChatMessageEndpoint(config.baseUrl, tokenManager, log),
-      new CodeEndpoint(config.baseUrl, tokenManager, log),
-      new AuthEndpoint(config.baseUrl, tokenManager, log),
-      new WebsocketEndpoint(config.baseUrl, tokenManager, log)
+      new EmergencyEndpoint(configWithDefaults, tokenManager, log),
+      new ClientEndpoint(configWithDefaults, tokenManager, log),
+      new StaffEndpoint(configWithDefaults, tokenManager, log),
+      new OrgSettingsEndpoint(configWithDefaults, tokenManager, log),
+      new ChatMessageEndpoint(configWithDefaults, tokenManager, log),
+      new CodeEndpoint(configWithDefaults, tokenManager, log),
+      new AuthEndpoint(configWithDefaults, tokenManager, log),
+      new WebsocketEndpoint(configWithDefaults, tokenManager, log)
     );
   }
 };