mitra-interactions-sdk 1.0.60-beta.2 → 1.0.60-beta.4

package/dist/index.js

@@ -347,7 +347,7 @@ async function fetchSsoAuthPageUrl(_baseURL) {
 }
 function buildStartUrl(authPageUrl, provider, state, appId, apiUrl) {
   const sep = authPageUrl.includes("?") ? "&" : "?";
-  return authPageUrl + sep + new URLSearchParams({ provider, state, appId, apiUrl }).toString();
+  return authPageUrl + sep + new URLSearchParams({ provider, state, appId, apiUrl, origin: window.location.origin }).toString();
 }
 function getOriginFromUrl2(url) {
   try {
@@ -370,6 +370,7 @@ function openOAuthPopup(providerUrl, expectedOrigin, expectedState) {
     const outerH = window.outerHeight || screen.height;
     const left = Math.max(0, (window.screenX || 0) + (outerW - POPUP_W) / 2);
     const top = Math.max(0, (window.screenY || 0) + (outerH - POPUP_H) / 2);
+    console.log("[mitra-sso] window.open ->", providerUrl);
     const popup = window.open(
       providerUrl,
       "mitra-oauth",
@@ -404,11 +405,11 @@ function openOAuthPopup(providerUrl, expectedOrigin, expectedState) {
         reject(new Error(data.error || "Erro na autentica\xE7\xE3o OAuth."));
         return;
       }
-      if (!data.code) {
-        reject(new Error("Resposta OAuth sem code."));
+      if (!data.token) {
+        reject(new Error("Resposta OAuth sem token."));
         return;
       }
-      resolve({ code: data.code });
+      resolve({ token: data.token });
     }
     function cleanup() {
       clearTimeout(timer);
@@ -437,13 +438,9 @@ async function loginWithProvider(provider, options) {
       const pageOrigin = getOriginFromUrl2(authPageUrl);
       const redirectUri = authPageUrl;
       const startUrl = buildStartUrl(authPageUrl, provider, state, appId, authUrl);
-      const { code } = await openOAuthPopup(startUrl, pageOrigin, state);
-      const tokens = await postNewAuth(buildEndpoint(authUrl, `/${provider}`), {
-        code,
-        redirectUri,
-        appId
-      });
-      const response = normalizeResponse(tokens, authUrl);
+      console.log("[mitra-sso] authPageUrl:", authPageUrl, "| startUrl:", startUrl, "| redirectUri:", redirectUri);
+      const { token } = await openOAuthPopup(startUrl, pageOrigin, state);
+      const response = normalizeResponse(token, authUrl);
       autoConfigureFromLogin2(response, authUrl, projectId);
       return response;
     } finally {
@@ -727,7 +724,7 @@ function buildUrl(endpoint, params) {
 async function tryRefreshToken() {
   var _a, _b;
   const config = getConfig();
-  if (!config.token || config.projectId == null) return false;
+  if (!config.token || config.projectId == null || !config.baseURL) return false;
   try {
     const baseURL = config.baseURL.replace(/\/+$/, "");
     const resp = await getFetch3()(`${baseURL}/mitraspace/project/refreshedToken/${config.projectId}`, {
@@ -777,7 +774,8 @@ async function handleResponse(response) {
 async function fetchWithRefresh(url, init) {
   const fetchFn = getFetch3();
   const response = await fetchFn(url, init);
-  if (response.status === 403) {
+  const expiredStatus = isNewWorld() ? 401 : 403;
+  if (response.status === expiredStatus) {
     const refreshed = await tryRefreshToken();
     if (refreshed) {
       const newHeaders = { ...buildHeaders() };