powr-sdk-web 5.10.5 → 5.10.7

package/dist/sso/api.js

@@ -29,8 +29,10 @@ function safeNextPath(next) {
 
 /**
  * Issue a one-time login code (caller must already be authenticated).
- * @param {string} apiUrl - Powr API base (…/powr)
+ * Host `injectProjectId` needs destination `projectId` on the body.
+ * @param {string} apiUrl - Powr API base
  * @param {string} bearerToken
+ * @param {{ projectId?: string }} [opts]
  */
 function issueLoginCode(_x, _x2) {
   return _issueLoginCode.apply(this, arguments);
@@ -39,20 +41,30 @@ function issueLoginCode(_x, _x2) {
  * Exchange loginId for session (same shape as /login).
  * @param {string} apiUrl
  * @param {string} loginId
+ * @param {{ projectId?: string }} [opts]
  */
 function _issueLoginCode() {
   _issueLoginCode = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(apiUrl, bearerToken) {
-    var res, data;
+    var opts,
+      projectId,
+      res,
+      data,
+      _args = arguments;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          opts = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
+          projectId = opts.projectId ? String(opts.projectId) : "";
           _context.n = 1;
           return fetch(joinApi(apiUrl, "auth/issue-login-code"), {
             method: "POST",
             headers: {
               Authorization: "Bearer ".concat(bearerToken),
               "Content-Type": "application/json"
-            }
+            },
+            body: JSON.stringify(projectId ? {
+              projectId: projectId
+            } : {})
           });
         case 1:
           res = _context.v;
@@ -79,19 +91,29 @@ function loginWithCode(_x3, _x4) {
 }
 function _loginWithCode() {
   _loginWithCode = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(apiUrl, loginId) {
-    var res, data, err;
+    var opts,
+      projectId,
+      body,
+      res,
+      data,
+      err,
+      _args2 = arguments;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
+          opts = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
+          projectId = opts.projectId ? String(opts.projectId) : "";
+          body = {
+            loginId: loginId
+          };
+          if (projectId) body.projectId = projectId;
           _context2.n = 1;
           return fetch(joinApi(apiUrl, "auth/login-with-code"), {
             method: "POST",
             headers: {
               "Content-Type": "application/json"
             },
-            body: JSON.stringify({
-              loginId: loginId
-            })
+            body: JSON.stringify(body)
           });
         case 1:
           res = _context2.v;

package/dist/sso/index.js

@@ -84,6 +84,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var config = require("../config");
 var shellStyle = {
   display: "flex",
   minHeight: "100vh",
@@ -149,7 +150,8 @@ var btnStyle = {
  * Apps keep a thin `/sso` page that renders this with `apiUrl` + `onSuccess`.
  *
  * @param {object} props
- * @param {string} props.apiUrl - Powr API base ending in /powr (or /powr/)
+ * @param {string} [props.apiUrl] - Powr host. Defaults to https://powr-api.lawazia.tech
+ * @param {string} [props.projectId] - Destination Powr id. Defaults to NEXT_PUBLIC_PROJECT_ID
  * @param {string} [props.appName]
  * @param {boolean} [props.ready=true] - Wait (e.g. auth hydrate) before exchanging code
  * @param {string} [props.loginHref="/login"]
@@ -162,6 +164,7 @@ var btnStyle = {
  */
 function PowrBaseSso(_ref) {
   var apiUrl = _ref.apiUrl,
+    projectIdProp = _ref.projectId,
     _ref$appName = _ref.appName,
     appName = _ref$appName === void 0 ? "App" : _ref$appName,
     _ref$ready = _ref.ready,
@@ -182,6 +185,8 @@ function PowrBaseSso(_ref) {
   })[0];
   var loginId = loginIdProp !== undefined ? loginIdProp : fromUrl.loginId;
   var next = nextProp !== undefined ? nextProp : fromUrl.next;
+  var powrApi = String(apiUrl || config.defaultPowrUrl || "").replace(/\/$/, "");
+  var projectId = String(projectIdProp || config.projectId || "");
   var _useState = (0, _react.useState)(loginId ? null : "Missing login link"),
     _useState2 = _slicedToArray(_useState, 2),
     error = _useState2[0],
@@ -194,10 +199,17 @@ function PowrBaseSso(_ref) {
   var onSuccessRef = (0, _react.useRef)(onSuccess);
   onSuccessRef.current = onSuccess;
   (0, _react.useEffect)(function () {
-    if (!loginId || !ready || !apiUrl || started.current) return;
+    if (!loginId || !ready || !powrApi || started.current) return;
+    if (!projectId) {
+      setError("Powr project is not configured");
+      setBusy(false);
+      return;
+    }
     started.current = true;
     setBusy(true);
-    (0, _api.loginWithCode)(apiUrl, loginId).then(/*#__PURE__*/function () {
+    (0, _api.loginWithCode)(powrApi, loginId, {
+      projectId: projectId
+    }).then(/*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(data) {
         var cb;
         return _regenerator().w(function (_context) {
@@ -227,7 +239,7 @@ function PowrBaseSso(_ref) {
       setError((err === null || err === void 0 ? void 0 : err.message) || "Could not finish sign-in");
       setBusy(false);
     });
-  }, [loginId, next, ready, apiUrl]);
+  }, [loginId, next, ready, powrApi, projectId]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: shellStyle
   }, /*#__PURE__*/_react["default"].createElement("style", null, "@keyframes powr-sso-spin{to{transform:rotate(360deg)}}"), /*#__PURE__*/_react["default"].createElement("p", {

package/dist/sso/openPowrLogin.js

@@ -13,6 +13,9 @@ function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present,
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var config = require("../config");
 function normalizeOrigin(value) {
   return String(value || "").replace(/\/$/, "").toLowerCase();
@@ -34,6 +37,28 @@ function originsFromApps(apps) {
     return "";
   }).filter(Boolean);
 }
+function projectIdFromApps(url, origins) {
+  if (!Array.isArray(origins)) return "";
+  var dest = parseDest(url);
+  if (!dest) return "";
+  var origin = normalizeOrigin(dest.origin);
+  var _iterator = _createForOfIteratorHelper(origins),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (!item || typeof item === "string" || !item.url || !item.projectId) continue;
+      if (normalizeOrigin(originFromEntry(item.url)) === origin) {
+        return String(item.projectId);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return "";
+}
 function parseDest(url) {
   try {
     var parsed = new URL(url);
@@ -56,19 +81,21 @@ function resolvePowrApiUrl(apiUrl) {
 
 /**
  * @param {string} url
- * @param {string[]|Array<{url?: string}>} [origins] - sibling card list or origins
- * @returns {{ origin: string, pathname: string, search: string, hash: string } | null}
+ * @param {string[]|Array<{url?: string, projectId?: string}>} [origins] - sibling card list or origins
+ * @returns {{ origin: string, pathname: string, search: string, hash: string, projectId: string } | null}
  */
 function matchPowrTarget(url, origins) {
   var dest = parseDest(url);
   if (!dest) return null;
   var list = originsFromApps(origins);
-  if (!list.length) return dest;
-  var origin = normalizeOrigin(dest.origin);
-  if (list.some(function (o) {
-    return normalizeOrigin(o) === origin;
-  })) return dest;
-  return null;
+  if (list.length) {
+    var origin = normalizeOrigin(dest.origin);
+    if (!list.some(function (o) {
+      return normalizeOrigin(o) === origin;
+    })) return null;
+  }
+  dest.projectId = projectIdFromApps(url, origins);
+  return dest;
 }
 
 /**
@@ -99,13 +126,14 @@ function openPlain(url) {
 
 /**
  * Issue a login code and navigate to `/sso?loginId=`.
- * Same as login/admin: `apiUrl` comes from the app (or NEXT_PUBLIC_POWR_URL).
+ * Host is the SDK default. Omit `apiUrl` unless this call is a real override.
  *
  * @param {string} url - Destination app URL (from the sibling card / banner)
  * @param {string|null|undefined} token
  * @param {object} [options]
- * @param {string} [options.apiUrl] - Powr API (`…/powr`). Pass from the app.
- * @param {string[]|Array<{url?: string}>} [options.origins] - The card list
+ * @param {string} [options.apiUrl] - Override host. Do not pass product `/powr`.
+ * @param {string} [options.projectId] - Destination Powr id (else from matched card)
+ * @param {string[]|Array<{url?: string, projectId?: string}>} [options.origins] - The card list
  */
 function openPowrLogin(_x, _x2) {
   return _openPowrLogin.apply(this, arguments);
@@ -114,6 +142,7 @@ function _openPowrLogin() {
   _openPowrLogin = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(url, token) {
     var options,
       apiUrl,
+      projectIdOpt,
       origins,
       _options$ssoPath,
       ssoPath,
@@ -123,6 +152,7 @@ function _openPowrLogin() {
       navigate,
       powrApi,
       dest,
+      projectId,
       data,
       _args = arguments,
       _t;
@@ -130,12 +160,13 @@ function _openPowrLogin() {
       while (1) switch (_context.p = _context.n) {
         case 0:
           options = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
-          apiUrl = options.apiUrl, origins = options.origins, _options$ssoPath = options.ssoPath, ssoPath = _options$ssoPath === void 0 ? "/sso" : _options$ssoPath, _options$onFallback = options.onFallback, onFallback = _options$onFallback === void 0 ? openPlain : _options$onFallback, _options$navigate = options.navigate, navigate = _options$navigate === void 0 ? function (ssoUrl) {
+          apiUrl = options.apiUrl, projectIdOpt = options.projectId, origins = options.origins, _options$ssoPath = options.ssoPath, ssoPath = _options$ssoPath === void 0 ? "/sso" : _options$ssoPath, _options$onFallback = options.onFallback, onFallback = _options$onFallback === void 0 ? openPlain : _options$onFallback, _options$navigate = options.navigate, navigate = _options$navigate === void 0 ? function (ssoUrl) {
             if (typeof window !== "undefined") window.location.assign(ssoUrl);
           } : _options$navigate;
           powrApi = resolvePowrApiUrl(apiUrl);
           dest = matchPowrTarget(url, origins);
-          if (!(!dest || !token || !powrApi)) {
+          projectId = projectIdOpt || (dest === null || dest === void 0 ? void 0 : dest.projectId);
+          if (!(!dest || !token || !powrApi || !projectId)) {
             _context.n = 1;
             break;
           }
@@ -144,7 +175,9 @@ function _openPowrLogin() {
         case 1:
           _context.p = 1;
           _context.n = 2;
-          return (0, _api.issueLoginCode)(powrApi, token);
+          return (0, _api.issueLoginCode)(powrApi, token, {
+            projectId: projectId
+          });
         case 2:
           data = _context.v;
           navigate(buildPowrSsoUrl(dest, data.loginId, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "powr-sdk-web",
-    "version": "5.10.5",
+    "version": "5.10.7",
     "main": "dist/index.js",
     "scripts": {
         "build": "babel src -d dist --copy-files",