@restoai/resto-datacli 0.2.0 → 0.2.1

package/dist/commands/auth.js

@@ -11,7 +11,17 @@ const DEFAULT_AUTH_GATEWAY_PLAT = "cli";
 const LOGIN_FOR_TOKEN_PATH = "/loginApi/loginForToken";
 const PHONE_CAPTCHA_PATH = "/vulcan/captcha/phoneCaptcha";
 const PROFILE_INFO_PATH = "/vulcan/profile/getInfo";
+const ORGANIZATION_VIEW_PATH = "/vulcan/employee/queryOrgView";
 const REPORT_SHOP_ORG_TYPE_LIST = [7];
+const ORGANIZATION_ID_FIELDS = [
+    "organizationId",
+    "orgId",
+    "corporationOrgId",
+    "brandId",
+    "orgShopId",
+    "franchiseeOrgId",
+    "orgFranchiseeId"
+];
 const PHONE_CAPTCHA_TYPE_VERIFY_CODE = "1";
 const PHONE_CAPTCHA_STEP_LOGIN = "1";
 const DEFAULT_PHONE_AREA_CODE = "86";
@@ -129,19 +139,40 @@ function buildReportContext(profile, options) {
     };
     return Object.keys(reportContext).length > 0 ? reportContext : undefined;
 }
-function extractProfileReportContext(payload) {
+function extractProfileIdentity(payload) {
     const data = asRecord(asRecord(payload)?.data) ?? asRecord(payload);
     const employeeCode = firstString(data?.employeeCode, data?.code, data?.loginId, data?.principalUid);
+    const employeeId = firstString(data?.employeeId, data?.id, data?.userId);
     const organizationId = firstString(data?.organizationId, data?.orgId);
-    const organizationType = firstString(data?.organizationType, data?.orgType, data?.type);
+    const organizationType = firstString(data?.organizationType, data?.orgType);
+    return { employeeCode, employeeId, organizationId, organizationType };
+}
+function extractProfileReportContext(payload, resolvedOrganizationType) {
+    const identity = extractProfileIdentity(payload);
+    const organizationType = resolvedOrganizationType ?? identity.organizationType;
     const reportContext = {
-        ...(employeeCode ? { employeeCode } : {}),
-        ...(organizationId ? { organizationId } : {}),
+        ...(identity.employeeCode ? { employeeCode: identity.employeeCode } : {}),
+        ...(identity.organizationId ? { organizationId: identity.organizationId } : {}),
         ...(organizationType ? { organizationType } : {}),
-        ...(organizationId ? { orgTypeList: REPORT_SHOP_ORG_TYPE_LIST } : {})
+        ...(identity.organizationId ? { orgTypeList: REPORT_SHOP_ORG_TYPE_LIST } : {})
     };
     return Object.keys(reportContext).length > 0 ? reportContext : undefined;
 }
+function resolveOrganizationType(payload, organizationId) {
+    const data = asRecord(asRecord(payload)?.data) ?? asRecord(payload);
+    const matchingTypes = new Set();
+    for (const record of collectRecords(data)) {
+        const matchesOrganization = ORGANIZATION_ID_FIELDS.some((fieldName) => firstString(record[fieldName]) === organizationId);
+        if (!matchesOrganization) {
+            continue;
+        }
+        const organizationType = firstString(record.orgType, record.organizationType);
+        if (organizationType) {
+            matchingTypes.add(organizationType);
+        }
+    }
+    return matchingTypes.size === 1 ? [...matchingTypes][0] : undefined;
+}
 function extractLoginProfile(payload, fallbackCorporationId) {
     const records = collectRecords(payload);
     const token = records.reduce((current, record) => current ?? firstString(record.token, record.accessToken, record.access_token), undefined);
@@ -154,7 +185,34 @@ function withReportContext(profile, options) {
     const reportContext = buildReportContext(profile, options);
     return reportContext ? { ...profile, reportContext } : profile;
 }
-async function fetchProfileReportContext(profile, fetchImpl) {
+async function fetchOrganizationType(profile, fetchImpl, employeeId, organizationId) {
+    const response = await fetchImpl(authGatewayUrl(profile.baseUrl, ORGANIZATION_VIEW_PATH, profile.plat), {
+        method: "POST",
+        headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+            "Corporation-Id": profile.corporationId,
+            "Vulcan-Token": profile.token,
+            "Language-Code": profile.languageCode,
+            "Accept-Timezone": profile.timezone
+        },
+        body: JSON.stringify({ id: employeeId, corporationId: profile.corporationId })
+    });
+    if (!response.ok) {
+        throw new Error(`Organization context request failed: ${response.status} ${response.statusText}`.trim());
+    }
+    const payload = await response.json();
+    const code = firstString(asRecord(payload)?.code);
+    if (code && code !== "000") {
+        throw new Error(extractLoginError(payload) ?? `Organization context request failed with code ${code}.`);
+    }
+    const organizationType = resolveOrganizationType(payload, organizationId);
+    if (!organizationType) {
+        throw new Error("Current organization type could not be resolved from the organization view.");
+    }
+    return organizationType;
+}
+async function fetchProfileReportContext(profile, fetchImpl, organizationTypeOverride) {
     const response = await fetchImpl(authGatewayUrl(profile.baseUrl, PROFILE_INFO_PATH, profile.plat), {
         method: "GET",
         headers: {
@@ -166,30 +224,33 @@ async function fetchProfileReportContext(profile, fetchImpl) {
         }
     });
     if (!response.ok) {
-        return undefined;
+        throw new Error(`Profile request failed: ${response.status} ${response.statusText}`.trim());
     }
     const payload = await response.json();
     const code = firstString(asRecord(payload)?.code);
     if (code && code !== "000") {
-        return undefined;
+        throw new Error(extractLoginError(payload) ?? `Profile request failed with code ${code}.`);
+    }
+    const identity = extractProfileIdentity(payload);
+    let organizationType = organizationTypeOverride ?? identity.organizationType;
+    if (!organizationType && identity.organizationId) {
+        if (!identity.employeeId) {
+            throw new Error("Profile did not contain an employee id for organization resolution.");
+        }
+        organizationType = await fetchOrganizationType(profile, fetchImpl, identity.employeeId, identity.organizationId);
     }
-    return extractProfileReportContext(payload);
+    return extractProfileReportContext(payload, organizationType);
 }
 async function hydrateReportContext(profile, options, fetchImpl) {
     const initialProfile = withReportContext(profile, options);
     if (hasCompleteReportContext(initialProfile.reportContext)) {
         return initialProfile;
     }
-    try {
-        const profileReportContext = await fetchProfileReportContext(profile, fetchImpl);
-        const hydratedProfile = profileReportContext
-            ? { ...profile, reportContext: { ...(profile.reportContext ?? {}), ...profileReportContext } }
-            : profile;
-        return withReportContext(hydratedProfile, options);
-    }
-    catch {
-        return initialProfile;
-    }
+    const profileReportContext = await fetchProfileReportContext(profile, fetchImpl, options.organizationType);
+    const hydratedProfile = profileReportContext
+        ? { ...profile, reportContext: { ...(profile.reportContext ?? {}), ...profileReportContext } }
+        : profile;
+    return withReportContext(hydratedProfile, options);
 }
 async function loginWithPassword(options, fetchImpl) {
     if (!options.baseUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restoai/resto-datacli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "bin": {
     "resto": "dist/cli.js"