@bindu-dashing/dam-solution-v2 5.8.134 → 5.8.136

package/build/hocs/DamConfigContext.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { createContext, useContext, useState, useEffect } from "react";
 import { USER_LOGIN, FETCH_TEAMS_LIST, } from "../utilities/constants/apiUrls";
 import axios from "axios";
-import { getBaseUrl, getTeamIDFromToken, getTeamsApiBaseUrl } from "./helpers";
+import { getBaseUrl, getTeamsApiBaseUrl } from "./helpers";
 import { get } from "lodash";
 import Loader from "../common/loader/loader";
 import { SUBSCRIPTION_EXPIRED_ERROR_MESSAGE } from "./appConstants";
@@ -28,8 +28,9 @@ export const DamConfigProvider = ({ children, config }) => {
     const [teams, setTeams] = useState([]);
     const [isAdmin, setIsAdmin] = useState(false);
     const [showPaymentErr, setShowPaymentErr] = useState(false);
+    const [teamID, setTeamID] = useState(null);
     const getToken = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         setLoading(true);
         try {
             const response = yield axios.post(getBaseUrl(appType) + USER_LOGIN, {
@@ -38,6 +39,7 @@ export const DamConfigProvider = ({ children, config }) => {
                 subdomain,
                 teams: teamIds,
             });
+            console.log("Token response:", response === null || response === void 0 ? void 0 : response.data);
             const token = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.access_token;
             const userData = (_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.user;
             const brandData = (_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f.brand;
@@ -45,6 +47,7 @@ export const DamConfigProvider = ({ children, config }) => {
             setDamUser(userData);
             setLoading(false);
             setBrand(brandData);
+            setTeamID((_h = (_g = response === null || response === void 0 ? void 0 : response.data) === null || _g === void 0 ? void 0 : _g.data) === null || _h === void 0 ? void 0 : _h.teamID);
             // Use initialRootFolderId if provided, otherwise use rootFolderId from API
             const apiRootFolderId = get(response, "data.data.rootFolderId");
             setRootFolderId(initialRootFolderId || apiRootFolderId);
@@ -56,7 +59,7 @@ export const DamConfigProvider = ({ children, config }) => {
         }
         catch (error) {
             console.error("Error fetching token:", error);
-            if (((_g = error === null || error === void 0 ? void 0 : error.response) === null || _g === void 0 ? void 0 : _g.status) === 402) {
+            if (((_j = error === null || error === void 0 ? void 0 : error.response) === null || _j === void 0 ? void 0 : _j.status) === 402) {
                 setShowPaymentErr(true);
             }
             setLoading(false);
@@ -69,14 +72,13 @@ export const DamConfigProvider = ({ children, config }) => {
             return;
         }
         try {
-            const teamID = getTeamIDFromToken(token);
             if (!teamID) {
                 console.log("Could not extract teamID from token");
                 return;
             }
             // Get the Teams API base URL (different from MIXDRIVE_API_URL)
             const teamsApiBaseUrl = getTeamsApiBaseUrl(appType);
-            const teamsEndpoint = FETCH_TEAMS_LIST.replace(":teamID", teamID.toString());
+            const teamsEndpoint = FETCH_TEAMS_LIST.replace(":teamID", teamID);
             const fullUrl = teamsApiBaseUrl + teamsEndpoint;
             console.log("Fetching teams from:", fullUrl);
             console.log("TeamID from token:", teamID);

package/build/hocs/helpers.d.ts

@@ -20,5 +20,3 @@ export declare const getRelativeTime: (timestamp: string) => string;
 export declare const getReadableFileType: (file: FileEntity) => string;
 export declare const humanFileSize: (size: any) => any;
 export declare const getFormattedValue: (outputFormatData: MetaDataFieldEntity[], fileUrl: string, item: any) => string;
-export declare const decodeJWT: (token: string) => any;
-export declare const getTeamIDFromToken: (token: string) => number | null;

package/build/hocs/helpers.js

@@ -1,6 +1,7 @@
 import dayjs from "dayjs";
 import { first, get, last, split, toLower, toUpper } from "lodash";
 import { DATE_FORMAT } from "./appConstants";
+import { FETCH_TEAMS_LIST } from "../utilities/constants/apiUrls";
 export const getProfileName = (name) => {
     return name
         ? name
@@ -109,26 +110,7 @@ export const getBaseUrl = (appType) => {
  * @returns Teams API base URL
  */
 export const getTeamsApiBaseUrl = (appType) => {
-    // Check for explicit teams API base URL
-    const teamsApiUrl = appType === "reactJs"
-        ? process.env.REACT_APP_TEAMS_API_URL
-        : process.env.NEXT_PUBLIC_TEAMS_API_URL;
-    if (teamsApiUrl) {
-        // Extract base URL from full URL (remove /teams/:teamID/list part)
-        // Example: https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1/teams/104/list
-        // Should become: https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1
-        const match = teamsApiUrl.match(/^(https?:\/\/[^\/]+(?:\/[^\/]+)*\/api\/v1)/);
-        if (match) {
-            return match[1];
-        }
-        // If pattern doesn't match, try to remove /teams/... part
-        const teamsIndex = teamsApiUrl.indexOf('/teams/');
-        if (teamsIndex !== -1) {
-            return teamsApiUrl.substring(0, teamsIndex);
-        }
-    }
-    // Fallback: use the hardcoded base URL
-    return "https://f5ubolirub.execute-api.ap-southeast-2.amazonaws.com/dev/api/v1";
+    return getBaseUrl(appType) + FETCH_TEAMS_LIST;
 };
 export const getRelativeTime = (timestamp) => {
     const now = new Date();
@@ -203,36 +185,3 @@ export const getFormattedValue = (outputFormatData, fileUrl, item) => {
     }, "");
     return value ? value : fileUrl;
 };
-export const decodeJWT = (token) => {
-    if (!token) {
-        return null;
-    }
-    try {
-        const parts = token.split(".");
-        if (parts.length !== 3) {
-            return null;
-        }
-        const payload = parts[1];
-        // Base64URL decode
-        const base64 = payload.replace(/-/g, "+").replace(/_/g, "/");
-        const jsonPayload = decodeURIComponent(atob(base64)
-            .split("")
-            .map((c) => {
-            return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
-        })
-            .join(""));
-        return JSON.parse(jsonPayload);
-    }
-    catch (error) {
-        console.error("Error decoding JWT:", error);
-        return null;
-    }
-};
-export const getTeamIDFromToken = (token) => {
-    const decoded = decodeJWT(token);
-    if (!decoded) {
-        return null;
-    }
-    // Handle both teamID and teamId (case variations)
-    return decoded.teamID || decoded.teamId || null;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.134",
+  "version": "5.8.136",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",