@openstax/ts-utils 1.44.4 → 1.45.1

package/dist/esm/index.d.ts

@@ -2,4 +2,3 @@ export * from './misc/hashValue.js';
 export * from './misc/helpers.js';
 export * from './misc/merge.js';
 export * from './misc/partitionSequence.js';
-export * from './misc/timingSafeCompareStrings.js';

package/dist/esm/index.js

@@ -2,4 +2,3 @@ export * from './misc/hashValue.js';
 export * from './misc/helpers.js';
 export * from './misc/merge.js';
 export * from './misc/partitionSequence.js';
-export * from './misc/timingSafeCompareStrings.js';

package/dist/esm/services/accountsGateway/index.d.ts

@@ -1,7 +1,7 @@
 import { ConfigProviderForConfig } from '../../config/index.js';
 import { GenericFetch } from '../../fetch/index.js';
 import { JsonCompatibleStruct } from '../../routing/index.js';
-import { ApiUser } from '../authProvider/index.js';
+import { ApiUser, ExternalId } from '../authProvider/index.js';
 import { Logger } from '../logger/index.js';
 export type Config = {
     accountsBase: string;
@@ -36,12 +36,12 @@ export type FindOrCreateUserPayload = {
 export type FindOrCreateUserResponse = {
     id: number;
     uuid: string;
-    external_ids: string[];
+    external_ids: ExternalId[];
     is_test: boolean;
     sso: string;
 };
 export type FindUserResponse = (FindOrCreateUserResponse & {
-    external_ids: string[];
+    external_ids: ExternalId[];
 }) | undefined;
 export type LinkUserPayload = {
     userId: number;
@@ -59,7 +59,7 @@ export type SearchUsersPayload = {
 };
 export type SearchUsersResponse = {
     items: Array<ApiUser & {
-        external_ids: string[];
+        external_ids: ExternalId[];
     } & JsonCompatibleStruct>;
     total_count: number;
 };
@@ -72,6 +72,10 @@ export type MappedUserInfo<T> = {
     platformUserId?: string;
     uuid: string;
 };
+/**
+ * Normalize an external_id to always return the string representation.
+ */
+export declare const normalizeExternalId: (externalId: ExternalId) => string;
 export declare const accountsGateway: <C extends string = "accounts">(initializer: Initializer<C>) => (configProvider: { [_key in C]: ConfigProviderForConfig<Config>; }) => ({ logger }: {
     logger: Logger;
 }) => {

package/dist/esm/services/accountsGateway/index.js

@@ -11,6 +11,12 @@ class ApiError extends Error {
         this.status = status;
     }
 }
+/**
+ * Normalize an external_id to always return the string representation.
+ */
+export const normalizeExternalId = (externalId) => {
+    return typeof externalId === 'string' ? externalId : externalId.external_id;
+};
 export const accountsGateway = (initializer) => (configProvider) => {
     const config = configProvider[ifDefined(initializer.configSpace, 'accounts')];
     const accountsBase = once(() => resolveConfigValue(config.accountsBase));
@@ -59,7 +65,8 @@ export const accountsGateway = (initializer) => (configProvider) => {
         const searchUsers = async (payload) => request(METHOD.GET, `users?${queryString.stringify(payload)}`, {});
         const updateUser = async (token, body) => request(METHOD.PUT, 'user', { body, token });
         const getPlatformUserId = (externalIds, platformId) => {
-            for (const externalId of externalIds) {
+            const normalizedIds = externalIds.map(normalizeExternalId);
+            for (const externalId of normalizedIds) {
                 const [userPlatformId, userId] = externalId.split('/', 2);
                 if (userPlatformId === platformId) {
                     return userId;

package/dist/esm/services/authProvider/index.d.ts

@@ -11,6 +11,11 @@ export type TokenUser = {
     name: string;
     uuid: string;
 };
+export type ExternalId = string | {
+    external_id: string;
+    user_id?: number;
+    role: string;
+};
 export type ApiUser = TokenUser & {
     id: number;
     first_name: string;
@@ -27,7 +32,7 @@ export type ApiUser = TokenUser & {
         name: string;
         roles: string[];
     }>;
-    external_ids: string[];
+    external_ids: ExternalId[];
     faculty_status: string;
     is_admin: boolean;
     is_not_gdpr_location: boolean;