@valiantys/atlassian-app-frontend 3.0.0-alpha-10 → 3.0.0-alpha-17

package/atlassian/shared/frontend-feature-atlassian-app/src/lib/standalone/atlassian-app-standalone/index.es.js

@@ -1,141 +1,150 @@
 import { jsx as r } from "react/jsx-runtime";
-import B from "@atlaskit/app-provider";
-import { useState as k, useCallback as d, useEffect as O, lazy as W } from "react";
-import { atlassianOAuthJiraFetch as x, atlassianOAuthConfluenceFetch as C, atlassianOAuthBitbucketFetch as E } from "../../../../../data-access-atlassian-product-fetch-oauth/src/lib/atlassian-oauth-fetch/index.es.js";
-import { AtlassianUserResourceService as J } from "../../../../../data-access-resources/src/lib/atlassian-user-resource-service/index.es.js";
-import { FeatureChosenWorkspaceCheck as T } from "../../../../../frontend-feature-chosen-workspace-check/src/lib/feature-chosen-workspace-check/index.es.js";
+import g from "@atlaskit/app-provider";
+import { useState as R, useCallback as d, useEffect as C, lazy as O } from "react";
+import { atlassianOAuthJiraFetch as W, atlassianOAuthConfluenceFetch as E, atlassianOAuthBitbucketFetch as J } from "../../../../../data-access-atlassian-product-fetch-oauth/src/lib/atlassian-oauth-fetch/index.es.js";
+import { AtlassianUserResourceService as T } from "../../../../../data-access-resources/src/lib/atlassian-user-resource-service/index.es.js";
+import { FeatureChosenWorkspaceCheck as y } from "../../../../../frontend-feature-chosen-workspace-check/src/lib/feature-chosen-workspace-check/index.es.js";
 import "../../../../../frontend-feature-chosen-workspace-check/src/lib/jira-workspace-provider/index.es.js";
-import { OAuthProvider as y, useOAuth as H } from "../../../../../frontend-feature-oauth-login/src/lib/feature-oauth/index.es.js";
+import { OAuthProvider as H, useOAuth as $ } from "../../../../../frontend-feature-oauth-login/src/lib/feature-oauth/index.es.js";
+import "../../../../../frontend-feature-oauth-login/src/lib/oauth-routes/index.es.js";
+import "@atlaskit/heading";
+import "@atlaskit/primitives";
+import "@atlaskit/section-message";
+import "@atlaskit/spinner";
 import "../../../../../frontend-ui-app-flags/src/lib/app-flags-dispatch/index.es.js";
-import { AppFlagsProviderAtlasKit as $ } from "../../../../../frontend-ui-app-flags/src/lib/app-flags-provider-atlaskit/index.es.js";
-import { RequestBitbucketProvider as b } from "../../../../../frontend-ui-atlassian-product-fetch/src/lib/request-bitbucket/index.es.js";
-import { RequestConfluenceProvider as j } from "../../../../../frontend-ui-atlassian-product-fetch/src/lib/request-confluence/index.es.js";
-import { RequestJiraProvider as z } from "../../../../../frontend-ui-atlassian-product-fetch/src/lib/request-jira/index.es.js";
-import { BackendAdapterProvider as K } from "../../../../../frontend-ui-backend-adapter/src/lib/backend-adapter/index.es.js";
-import { getOauthFetchInvokeImpl as M } from "../../../../../frontend-ui-backend-adapter/src/lib/oauth-fetch-invoke/index.es.js";
-import { WindowHostRouter as D } from "../../../../../frontend-ui-host-router/src/lib/host-router/index.es.js";
+import { AppFlagsProviderAtlasKit as b } from "../../../../../frontend-ui-app-flags/src/lib/app-flags-provider-atlaskit/index.es.js";
+import { RequestBitbucketProvider as j } from "../../../../../frontend-ui-atlassian-product-fetch/src/lib/request-bitbucket/index.es.js";
+import { RequestConfluenceProvider as z } from "../../../../../frontend-ui-atlassian-product-fetch/src/lib/request-confluence/index.es.js";
+import { RequestJiraProvider as K } from "../../../../../frontend-ui-atlassian-product-fetch/src/lib/request-jira/index.es.js";
+import { BackendAdapterProvider as M } from "../../../../../frontend-ui-backend-adapter/src/lib/backend-adapter/index.es.js";
+import { getOauthFetchInvokeImpl as D } from "../../../../../frontend-ui-backend-adapter/src/lib/oauth-fetch-invoke/index.es.js";
+import { WindowHostRouter as G } from "../../../../../frontend-ui-host-router/src/lib/host-router/index.es.js";
 import "@atlaskit/button/new";
-import { HostRouterProvider as G } from "../../../../../frontend-ui-host-router/src/lib/host-router-provider/index.es.js";
+import { HostRouterProvider as L } from "../../../../../frontend-ui-host-router/src/lib/host-router-provider/index.es.js";
 import "../../../../../frontend-ui-modal/src/lib/modal-content/index.es.js";
-import "@atlaskit/heading";
-import "@atlaskit/primitives";
-import { WindowModalService as L } from "../../../../../frontend-ui-modal/src/lib/modal-service/index.es.js";
-import { ModalServiceProvider as Q } from "../../../../../frontend-ui-modal/src/lib/modal-service-provider/index.es.js";
-import { ModalViewContext as U } from "../../../../../frontend-ui-modal/src/lib/modal-view-context/index.es.js";
-import { RemoteAdapterProvider as X } from "../../../../../frontend-ui-remote-adapter/src/lib/remote-adapter/index.es.js";
-import { oauthFetchInvokeRemote as Y } from "../../../../../frontend-ui-remote-adapter/src/lib/oauth-fetch-invoke-remote/index.es.js";
-import { ViewContextProvider as Z } from "../../../../../frontend-ui-view-context/src/lib/view-context-provider/index.es.js";
-import { MockViewContext as _ } from "../../../../../frontend-ui-view-context/src/lib/mock-view-context/index.es.js";
-const V = W(
+import { WindowModalService as Q } from "../../../../../frontend-ui-modal/src/lib/modal-service/index.es.js";
+import { ModalServiceProvider as U } from "../../../../../frontend-ui-modal/src/lib/modal-service-provider/index.es.js";
+import { ModalViewContext as X } from "../../../../../frontend-ui-modal/src/lib/modal-view-context/index.es.js";
+import { RemoteAdapterProvider as Y } from "../../../../../frontend-ui-remote-adapter/src/lib/remote-adapter/index.es.js";
+import { oauthFetchInvokeRemote as Z } from "../../../../../frontend-ui-remote-adapter/src/lib/oauth-fetch-invoke-remote/index.es.js";
+import { ViewContextProvider as _ } from "../../../../../frontend-ui-view-context/src/lib/view-context-provider/index.es.js";
+import { MockViewContext as V } from "../../../../../frontend-ui-view-context/src/lib/mock-view-context/index.es.js";
+const N = O(
   () => import("../../../../../frontend-feature-chosen-resource-check/src/index/index.es.js")
 );
-function Oe({
-  initialMockViewContext: n,
+function Ee({
+  initialMockViewContext: i,
   backendUrl: c,
   remoteUrl: l,
   doCheckWorkspace: I,
-  appName: i,
-  doCheckResource: u,
-  modalOpenerConfig: p,
+  appName: s,
+  doCheckResource: p,
+  modalOpenerConfig: u,
   modalContextConfig: a,
-  oauthConfig: s,
+  oauthConfig: n,
+  atlassianResourceId: A,
   children: t
 }) {
   const h = /* @__PURE__ */ r(
-    N,
+    ee,
     {
-      appName: i,
+      appName: s,
       backendUrl: c,
       remoteUrl: l,
-      initialMockViewContext: n,
-      modalOpenerConfig: p,
+      initialMockViewContext: i,
+      modalOpenerConfig: u,
       modalContextConfig: a,
       doCheckWorkspace: I,
-      doCheckResource: u,
-      oauthConfig: s,
+      doCheckResource: p,
+      oauthConfig: n,
+      atlassianResourceId: A,
       children: t
     }
   );
-  return s ? /* @__PURE__ */ r(
-    y,
+  return n ? /* @__PURE__ */ r(
+    H,
     {
-      clientId: s.clientId,
-      codeTokenExchangeUrl: s.codeTokenExchangeUrl,
-      appName: i,
-      oAuthScopes: s.oAuthScopes,
+      clientId: n.clientId,
+      codeTokenExchangeUrl: n.codeTokenExchangeUrl,
+      appName: s,
+      oAuthScopes: n.oAuthScopes,
+      appBaseContext: n.appBaseContext,
       children: h
     }
   ) : h;
 }
-function N({
-  initialMockViewContext: n,
+function ee({
+  initialMockViewContext: i,
   backendUrl: c,
   remoteUrl: l,
   doCheckWorkspace: I,
-  appName: i,
-  doCheckResource: u,
-  modalOpenerConfig: p,
+  appName: s,
+  doCheckResource: p,
+  modalOpenerConfig: u,
   modalContextConfig: a,
-  children: s
+  atlassianResourceId: n,
+  children: A
 }) {
-  const [t, h] = k(), [m, R] = k(), { getAuthToken: o } = H(), F = d(() => x(o(), t ?? ""), [o, t]), P = d(() => C(o(), t ?? ""), [o, t]), w = d(() => E(o()), [o]), g = d(
+  const [t, h] = R(
+    n
+  ), [m, F] = R(), { getAuthToken: o } = $(), P = d(() => W(o(), t ?? ""), [o, t]), w = d(() => E(o(), t ?? ""), [o, t]), B = d(() => J(o()), [o]), q = d(
     async (f) => {
-      if (c && u) {
-        const A = f ?? localStorage.getItem(`${i}-user-resource-id`) ?? "", v = await new J().checkUserChosenResource(
+      if (c && p) {
+        const S = f ?? localStorage.getItem(`${s}-user-resource-id`) ?? "", v = await new T().checkUserChosenResource(
           o(),
-          A
+          S
         );
         return v.hasChosen && (localStorage.setItem(
-          `${i}-user-resource-id`,
+          `${s}-user-resource-id`,
           v.resource.id
         ), h(v.resource.id)), v;
       } else
         return { hasChosen: !0 };
     },
-    [c, o, i, u]
+    [c, o, s, p]
   );
-  O(() => {
-    const f = t ?? (n == null ? void 0 : n.cloudId) ?? "";
+  C(() => {
+    const f = t ?? (i == null ? void 0 : i.cloudId) ?? "";
     if (!m || m.cloudId !== f) {
-      const A = {
-        ...m || n,
+      const S = {
+        ...m || i,
         cloudId: f
       };
-      R(A);
+      F(S);
     }
-  }, [n, t, m]);
-  const q = d(
-    () => c ? M(c, o(), t ?? "") : void 0,
+  }, [i, t, m]);
+  const x = d(
+    () => c ? D(c, o(), t ?? "") : void 0,
     [t, o, c]
   );
-  let e = s;
-  I && (e = /* @__PURE__ */ r(T, { appName: i, children: e })), p && (e = /* @__PURE__ */ r(
-    Q,
+  let e = A;
+  I && (e = /* @__PURE__ */ r(y, { appName: s, children: e })), u && (e = /* @__PURE__ */ r(
+    U,
     {
-      modalService: new L(
-        p.defaultUrl,
-        p.resourceMap
+      modalService: new Q(
+        u.defaultUrl,
+        u.resourceMap
       ),
       children: e
     }
   )), m && (e = /* @__PURE__ */ r(
-    Z,
+    _,
     {
-      viewContext: a ? new U(m, a.openerOrigin) : new _(m),
+      viewContext: a ? new X(m, a.openerOrigin) : new V(m),
       children: e
     }
-  )), e = /* @__PURE__ */ r(G, { hostRouter: new D(), children: /* @__PURE__ */ r(
-    b,
+  )), e = /* @__PURE__ */ r(L, { hostRouter: new G(), children: /* @__PURE__ */ r(
+    j,
     {
-      requestBitbucketImplementation: w(),
+      requestBitbucketImplementation: B(),
       children: /* @__PURE__ */ r(
-        j,
+        z,
         {
-          requestConfluenceImplementation: P(),
+          requestConfluenceImplementation: w(),
           children: /* @__PURE__ */ r(
-            z,
+            K,
             {
-              requestJiraImplementation: F(),
+              requestJiraImplementation: P(),
               children: e
             }
           )
@@ -143,16 +152,16 @@ function N({
       )
     }
   ) });
-  const S = q();
-  return S && (e = /* @__PURE__ */ r(K, { invokeImplementation: S, children: e })), l && (e = /* @__PURE__ */ r(
-    X,
+  const k = x();
+  return k && (e = /* @__PURE__ */ r(M, { invokeImplementation: k, children: e })), l && (e = /* @__PURE__ */ r(
+    Y,
     {
-      invokeRemoteImplementation: Y(l),
+      invokeRemoteImplementation: Z(l),
       children: e
     }
-  )), u && (e = /* @__PURE__ */ r(V, { checkResource: g, children: e })), /* @__PURE__ */ r(B, { children: /* @__PURE__ */ r($, { children: e }) });
+  )), p && (e = /* @__PURE__ */ r(N, { checkResource: q, children: e })), /* @__PURE__ */ r(g, { children: /* @__PURE__ */ r(b, { children: e }) });
 }
 export {
-  Oe as AtlassianAppStandalone,
-  Oe as default
+  Ee as AtlassianAppStandalone,
+  Ee as default
 };

package/atlassian/shared/frontend-feature-oauth-login/src/lib/feature-oauth/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("react/jsx-runtime"),d=require("@atlaskit/primitives"),a=require("react"),r=require("react-router-dom"),w=require("../ui-oauth-callback/index.cjs.js"),j=require("../ui-oauth-redirect-login/index.cjs.js"),g=require("../util/index.cjs.js"),v=d.xcss({paddingBlockStart:"space.1000"}),h=a.createContext(null),O=()=>{const o=a.useContext(h);return o||(console.warn("No OAuth provider"),{getAuthToken:()=>""})};function x({children:o,...e}){const[u,m]=a.useState(localStorage.getItem(`${e.appName}-auth-token`)),i=localStorage.getItem(`${e.appName}-auth-expires-at`),[n,A]=a.useState(i?Number(i):null),l=window.location.protocol+"//"+window.location.hostname+(window.location.port?`:${window.location.port}`:""),c=l+"/callback";function k(){return n&&u&&!p(n)?u:(g.redirectLogin(e.clientId,c,e.oAuthScopes),"")}function S(s){m(s.token),localStorage.setItem(`${e.appName}-auth-token`,s.token),A(s.expiresAt),localStorage.setItem(`${e.appName}-auth-expires-at`,s.expiresAt.toString()),localStorage.removeItem(`${e.appName}-user-resource-id`),localStorage.removeItem(`${e.appName}-user-workspace-id`),window.location.href=l}return!u||!n||p(n)?t.jsx(d.Flex,{justifyContent:"center",xcss:v,children:t.jsx(r.BrowserRouter,{children:t.jsxs(r.Routes,{children:[t.jsx(r.Route,{path:"/",element:t.jsx(j.OAuthRedirectLogin,{clientId:e.clientId,redirectUri:c,oAuthScopes:e.oAuthScopes})}),t.jsx(r.Route,{path:"/callback",element:t.jsx(w.OAuthCallback,{setAuth:S,redirectUri:c,codeTokenExchangeUrl:e.codeTokenExchangeUrl})}),t.jsx(r.Route,{path:"/*",element:t.jsx(r.Navigate,{to:"/",replace:!0})})]})})}):t.jsx(h.Provider,{value:{getAuthToken:k},children:o})}function p(o){return o<Date.now()}exports.OAuthProvider=x;exports.default=x;exports.useOAuth=O;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const l=require("react/jsx-runtime"),t=require("react"),w=require("../oauth-routes/index.cjs.js"),A=require("../util/index.cjs.js"),p=t.createContext(null),S=()=>{const o=t.useContext(p);return o||(console.warn("No OAuth provider"),{getAuthToken:()=>""})};function i({children:o,...e}){const s=t.useMemo(()=>localStorage.getItem(`${e.appName}-auth-token`),[e.appName]),a=t.useMemo(()=>{const r=localStorage.getItem(`${e.appName}-auth-expires-at`);return r?Number(r):null},[e.appName]),n=t.useMemo(()=>window.location.protocol+"//"+window.location.hostname+(window.location.port?`:${window.location.port}`:"")+(e.appBaseContext??""),[e.appBaseContext]),u=t.useMemo(()=>n+"/callback?location="+window.location.href,[n]),m=t.useMemo(()=>(e.appBaseContext??"")+"/callback",[e.appBaseContext]),h=t.useCallback(r=>{localStorage.setItem(`${e.appName}-auth-token`,r.token),localStorage.setItem(`${e.appName}-auth-expires-at`,r.expiresAt.toString()),localStorage.removeItem(`${e.appName}-user-resource-id`),localStorage.removeItem(`${e.appName}-user-workspace-id`);const x=new URLSearchParams(window.location.search);window.location.href=x.get("location")??n},[e.appName,n]),d=t.useMemo(()=>({getAuthToken:()=>a&&s&&!c(a)?s:(A.redirectLogin(e.clientId,u,e.oAuthScopes),"")}),[e.clientId,e.oAuthScopes,a,u,s]);return!s||!a||c(a)?l.jsx(w.OAuthRoutes,{setAuth:h,redirectUri:u,oAuthScopes:e.oAuthScopes,codeTokenExchangeUrl:e.codeTokenExchangeUrl,callbackPath:m,clientId:e.clientId}):l.jsx(p.Provider,{value:d,children:o})}function c(o){return o<Date.now()}exports.OAuthProvider=i;exports.default=i;exports.useOAuth=S;

package/atlassian/shared/frontend-feature-oauth-login/src/lib/feature-oauth/index.es.js

@@ -1,73 +1,65 @@
-import { jsx as t, jsxs as k } from "react/jsx-runtime";
-import { Flex as w, xcss as S } from "@atlaskit/primitives";
-import { useState as p, createContext as I, useContext as N } from "react";
-import { BrowserRouter as g, Routes as f, Route as l, Navigate as v } from "react-router-dom";
-import { OAuthCallback as $ } from "../ui-oauth-callback/index.es.js";
-import { OAuthRedirectLogin as O } from "../ui-oauth-redirect-login/index.es.js";
-import { redirectLogin as T } from "../util/index.es.js";
-const C = S({
-  paddingBlockStart: "space.1000"
-}), m = I(null), L = () => {
-  const o = N(m);
-  return o || (console.warn("No OAuth provider"), { getAuthToken: () => "" });
+import { jsx as p } from "react/jsx-runtime";
+import { useMemo as o, useCallback as w, createContext as x, useContext as A } from "react";
+import { OAuthRoutes as k } from "../oauth-routes/index.es.js";
+import { redirectLogin as S } from "../util/index.es.js";
+const u = x(null), v = () => {
+  const t = A(u);
+  return t || (console.warn("No OAuth provider"), { getAuthToken: () => "" });
 };
-function P({
-  children: o,
+function b({
+  children: t,
   ...e
 }) {
-  const [a, d] = p(
-    localStorage.getItem(`${e.appName}-auth-token`)
-  ), c = localStorage.getItem(
-    `${e.appName}-auth-expires-at`
-  ), [r, h] = p(
-    c ? Number(c) : null
-  ), i = window.location.protocol + "//" + window.location.hostname + (window.location.port ? `:${window.location.port}` : ""), s = i + "/callback";
-  function x() {
-    return r && a && !u(r) ? a : (T(e.clientId, s, e.oAuthScopes), "");
-  }
-  function A(n) {
-    d(n.token), localStorage.setItem(`${e.appName}-auth-token`, n.token), h(n.expiresAt), localStorage.setItem(
-      `${e.appName}-auth-expires-at`,
-      n.expiresAt.toString()
-    ), localStorage.removeItem(`${e.appName}-user-resource-id`), localStorage.removeItem(`${e.appName}-user-workspace-id`), window.location.href = i;
-  }
-  return !a || !r || u(r) ? /* @__PURE__ */ t(w, { justifyContent: "center", xcss: C, children: /* @__PURE__ */ t(g, { children: /* @__PURE__ */ k(f, { children: [
-    /* @__PURE__ */ t(
-      l,
-      {
-        path: "/",
-        element: /* @__PURE__ */ t(
-          O,
-          {
-            clientId: e.clientId,
-            redirectUri: s,
-            oAuthScopes: e.oAuthScopes
-          }
-        )
-      }
-    ),
-    /* @__PURE__ */ t(
-      l,
-      {
-        path: "/callback",
-        element: /* @__PURE__ */ t(
-          $,
-          {
-            setAuth: A,
-            redirectUri: s,
-            codeTokenExchangeUrl: e.codeTokenExchangeUrl
-          }
-        )
-      }
-    ),
-    /* @__PURE__ */ t(l, { path: "/*", element: /* @__PURE__ */ t(v, { to: "/", replace: !0 }) })
-  ] }) }) }) : /* @__PURE__ */ t(m.Provider, { value: { getAuthToken: x }, children: o });
+  const n = o(
+    () => localStorage.getItem(`${e.appName}-auth-token`),
+    [e.appName]
+  ), a = o(() => {
+    const r = localStorage.getItem(
+      `${e.appName}-auth-expires-at`
+    );
+    return r ? Number(r) : null;
+  }, [e.appName]), s = o(
+    () => window.location.protocol + "//" + window.location.hostname + (window.location.port ? `:${window.location.port}` : "") + (e.appBaseContext ?? ""),
+    [e.appBaseContext]
+  ), l = o(
+    () => s + "/callback?location=" + window.location.href,
+    [s]
+  ), m = o(
+    () => (e.appBaseContext ?? "") + "/callback",
+    [e.appBaseContext]
+  ), i = w(
+    (r) => {
+      localStorage.setItem(`${e.appName}-auth-token`, r.token), localStorage.setItem(
+        `${e.appName}-auth-expires-at`,
+        r.expiresAt.toString()
+      ), localStorage.removeItem(`${e.appName}-user-resource-id`), localStorage.removeItem(`${e.appName}-user-workspace-id`);
+      const d = new URLSearchParams(window.location.search);
+      window.location.href = d.get("location") ?? s;
+    },
+    [e.appName, s]
+  ), h = o(
+    () => ({
+      getAuthToken: () => a && n && !c(a) ? n : (S(e.clientId, l, e.oAuthScopes), "")
+    }),
+    [e.clientId, e.oAuthScopes, a, l, n]
+  );
+  return !n || !a || c(a) ? /* @__PURE__ */ p(
+    k,
+    {
+      setAuth: i,
+      redirectUri: l,
+      oAuthScopes: e.oAuthScopes,
+      codeTokenExchangeUrl: e.codeTokenExchangeUrl,
+      callbackPath: m,
+      clientId: e.clientId
+    }
+  ) : /* @__PURE__ */ p(u.Provider, { value: h, children: t });
 }
-function u(o) {
-  return o < Date.now();
+function c(t) {
+  return t < Date.now();
 }
 export {
-  P as OAuthProvider,
-  P as default,
-  L as useOAuth
+  b as OAuthProvider,
+  b as default,
+  v as useOAuth
 };

package/atlassian/shared/frontend-feature-oauth-login/src/lib/oauth-routes/index.cjs.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("react/jsx-runtime"),r=require("@atlaskit/primitives"),t=require("react-router-dom"),a=require("../ui-oauth-callback/index.cjs.js"),l=require("../ui-oauth-redirect-login/index.cjs.js"),x=r.xcss({paddingBlockStart:"space.1000"});function h({codeTokenExchangeUrl:u,clientId:o,oAuthScopes:n,redirectUri:s,callbackPath:i,setAuth:c}){return e.jsx(r.Flex,{justifyContent:"center",xcss:x,children:e.jsx(t.BrowserRouter,{children:e.jsxs(t.Routes,{children:[e.jsx(t.Route,{path:"/",element:e.jsx(l.OAuthRedirectLogin,{clientId:o,redirectUri:s,oAuthScopes:n})}),e.jsx(t.Route,{path:i,element:e.jsx(a.OAuthCallback,{setAuth:c,redirectUri:s,codeTokenExchangeUrl:u})}),e.jsx(t.Route,{path:"/*",element:e.jsx(t.Navigate,{to:"/",replace:!0})})]})})})}exports.OAuthRoutes=h;

package/atlassian/shared/frontend-feature-oauth-login/src/lib/oauth-routes/index.es.js

@@ -0,0 +1,51 @@
+import { jsx as t, jsxs as m } from "react/jsx-runtime";
+import { Flex as a, xcss as l } from "@atlaskit/primitives";
+import { BrowserRouter as p, Routes as u, Route as e, Navigate as h } from "react-router-dom";
+import { OAuthCallback as f } from "../ui-oauth-callback/index.es.js";
+import { OAuthRedirectLogin as x } from "../ui-oauth-redirect-login/index.es.js";
+const d = l({
+  paddingBlockStart: "space.1000"
+});
+function k({
+  codeTokenExchangeUrl: r,
+  clientId: n,
+  oAuthScopes: s,
+  redirectUri: o,
+  callbackPath: c,
+  setAuth: i
+}) {
+  return /* @__PURE__ */ t(a, { justifyContent: "center", xcss: d, children: /* @__PURE__ */ t(p, { children: /* @__PURE__ */ m(u, { children: [
+    /* @__PURE__ */ t(
+      e,
+      {
+        path: "/",
+        element: /* @__PURE__ */ t(
+          x,
+          {
+            clientId: n,
+            redirectUri: o,
+            oAuthScopes: s
+          }
+        )
+      }
+    ),
+    /* @__PURE__ */ t(
+      e,
+      {
+        path: c,
+        element: /* @__PURE__ */ t(
+          f,
+          {
+            setAuth: i,
+            redirectUri: o,
+            codeTokenExchangeUrl: r
+          }
+        )
+      }
+    ),
+    /* @__PURE__ */ t(e, { path: "/*", element: /* @__PURE__ */ t(h, { to: "/", replace: !0 }) })
+  ] }) }) });
+}
+export {
+  k as OAuthRoutes
+};

package/atlassian/shared/frontend-ui-page-loading-view/src/lib/page-loading-view/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("react/jsx-runtime"),s=require("@atlaskit/heading"),o=require("@atlaskit/primitives"),a=require("@atlaskit/section-message"),c=require("@atlaskit/spinner");function r({label:n,loadingError:i,labelSize:t}){return e.jsxs(o.Flex,{direction:"column",children:[e.jsx(s,{size:t||"large",children:n}),i?e.jsx(a,{appearance:"error",children:i}):e.jsx(c,{interactionName:"load"})]})}exports.PageLoadingView=r;exports.default=r;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("react/jsx-runtime"),s=require("@atlaskit/heading"),o=require("@atlaskit/primitives"),a=require("@atlaskit/section-message"),c=require("@atlaskit/spinner");function r({label:n,loadingError:i,labelSize:t}){return e.jsxs(o.Flex,{direction:"column",children:[e.jsx(s,{size:t??"large",children:n}),i?e.jsx(a,{appearance:"error",children:i}):e.jsx(c,{interactionName:"load"})]})}exports.PageLoadingView=r;exports.default=r;

package/atlassian/shared/frontend-ui-page-loading-view/src/lib/page-loading-view/index.es.js

@@ -9,7 +9,7 @@ function g({
   labelSize: o
 }) {
   return /* @__PURE__ */ n(a, { direction: "column", children: [
-    /* @__PURE__ */ e(t, { size: o || "large", children: i }),
+    /* @__PURE__ */ e(t, { size: o ?? "large", children: i }),
     r ? /* @__PURE__ */ e(m, { appearance: "error", children: r }) : /* @__PURE__ */ e(c, { interactionName: "load" })
   ] });
 }

package/atlassian-app/index.d.ts

@@ -104,6 +104,7 @@ export declare const IS_STANDALONE: boolean;
 declare interface OAuthProviderProps {
     clientId: string;
     codeTokenExchangeUrl: string;
+    appBaseContext?: string;
     /**
      * OAuth App Name
      */

package/atlassian-app-standalone/atlassian-app-frontend-atlassian-app-standalone.api.json

@@ -179,7 +179,7 @@
           "excerptTokens": [
             {
               "kind": "Content",
-              "text": "export declare function AtlassianAppStandalone({ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, children, }: "
+              "text": "export declare function AtlassianAppStandalone({ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, atlassianResourceId, children, }: "
             },
             {
               "kind": "Reference",
@@ -226,7 +226,7 @@
           "overloadIndex": 1,
           "parameters": [
             {
-              "parameterName": "{ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, children, }",
+              "parameterName": "{ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, atlassianResourceId, children, }",
               "parameterTypeTokenRange": {
                 "startIndex": 1,
                 "endIndex": 5
@@ -278,6 +278,33 @@
                 "endIndex": 2
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@valiantys/atlassian-app-frontend!JiraStandaloneAppWrapperProps#atlassianResourceId:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "atlassianResourceId?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "string"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "atlassianResourceId",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@valiantys/atlassian-app-frontend!JiraStandaloneAppWrapperProps#backendUrl:member",

package/atlassian-app-standalone/atlassian-app-frontend.api.md

@@ -9,13 +9,15 @@ import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { PropsWithChildren } from 'react';
 
 // @public (undocumented)
-export function AtlassianAppStandalone({ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, children, }: PropsWithChildren<JiraStandaloneAppWrapperProps>): JSX_2.Element;
+export function AtlassianAppStandalone({ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, atlassianResourceId, children, }: PropsWithChildren<JiraStandaloneAppWrapperProps>): JSX_2.Element;
 
 // @public (undocumented)
 export interface JiraStandaloneAppWrapperProps {
     // (undocumented)
     appName: string;
     // (undocumented)
+    atlassianResourceId?: string;
+    // (undocumented)
     backendUrl?: string;
     // (undocumented)
     doCheckResource?: boolean;

package/atlassian-app-standalone/index.d.ts

@@ -2,7 +2,7 @@ import { FullContext } from '@forge/bridge/out/types';
 import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { PropsWithChildren } from 'react';
 
-export declare function AtlassianAppStandalone({ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, children, }: PropsWithChildren<JiraStandaloneAppWrapperProps>): JSX_2.Element;
+export declare function AtlassianAppStandalone({ initialMockViewContext, backendUrl, remoteUrl, doCheckWorkspace, appName, doCheckResource, modalOpenerConfig, modalContextConfig, oauthConfig, atlassianResourceId, children, }: PropsWithChildren<JiraStandaloneAppWrapperProps>): JSX_2.Element;
 
 declare type AtlassianAppStandaloneOauthConfig = OAuthProviderProps & {
     doCheckResource?: boolean;
@@ -28,11 +28,13 @@ export declare interface JiraStandaloneAppWrapperProps {
     };
     appName: string;
     oauthConfig?: AtlassianAppStandaloneOauthConfig;
+    atlassianResourceId?: string;
 }
 
 declare interface OAuthProviderProps {
     clientId: string;
     codeTokenExchangeUrl: string;
+    appBaseContext?: string;
     /**
      * OAuth App Name
      */

package/atlassian-app-test/index.d.ts

@@ -39,7 +39,7 @@ declare type FetchRoute = {
     readonly value: string;
 };
 
-declare type FetchSignature = <T>(request: FetchRequest, body?: Record<string, any>) => Promise<T>;
+declare type FetchSignature = <T>(request: FetchRequest, body?: any) => Promise<T>;
 
 declare interface HostRouter {
     navigate(url: string): Promise<void>;

package/data-access-assets/index.d.ts

@@ -225,7 +225,7 @@ declare type FetchRoute = {
     readonly value: string;
 };
 
-declare type FetchSignature = <T>(request: FetchRequest, body?: Record<string, any>) => Promise<T>;
+declare type FetchSignature = <T>(request: FetchRequest, body?: any) => Promise<T>;
 
 export declare function getAssetLinkedIssues(fetch: AtlassianProductFetchService<'jira'>, workspaceId: string, objectId: string): Promise<ObjectConnectedTickets>;