powr-sdk-web 6.11.0 → 6.12.1

package/dist/config.js

@@ -7,5 +7,12 @@ var config = {
   powrUrl: process.env.NEXT_PUBLIC_POWR_URL,
   defaultPowrUrl: DEFAULT_POWR_API_URL
 };
+
+/** Prop, then NEXT_PUBLIC_POWR_URL, then the stable host. Empty prop must not become the URL "undefined". */
+function resolvePowrApiUrl(apiUrl) {
+  var raw = apiUrl || config.powrUrl || config.defaultPowrUrl || "";
+  return String(raw).replace(/\/$/, "");
+}
 module.exports = config;
-module.exports.DEFAULT_POWR_API_URL = DEFAULT_POWR_API_URL;
+module.exports.DEFAULT_POWR_API_URL = DEFAULT_POWR_API_URL;
+module.exports.resolvePowrApiUrl = resolvePowrApiUrl;

package/dist/index.js

@@ -405,6 +405,12 @@ Object.defineProperty(exports, "coercePhoneForStorage", {
     return _phone.coercePhoneForStorage;
   }
 });
+Object.defineProperty(exports, "currentReturnPath", {
+  enumerable: true,
+  get: function get() {
+    return _sso.currentReturnPath;
+  }
+});
 Object.defineProperty(exports, "defineAppStep", {
   enumerable: true,
   get: function get() {
@@ -519,6 +525,12 @@ Object.defineProperty(exports, "issueLoginCode", {
     return _sso.issueLoginCode;
   }
 });
+Object.defineProperty(exports, "loginHrefWithNext", {
+  enumerable: true,
+  get: function get() {
+    return _sso.loginHrefWithNext;
+  }
+});
 Object.defineProperty(exports, "loginWithCode", {
   enumerable: true,
   get: function get() {

package/dist/onboarding/utils.js

@@ -111,6 +111,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, e) { if ("object" != _typeof(t) || !t) return t; var r; if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) { var i = r.call(t, e || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === e ? String : Number)(t); }
+var config = require('../config');
 function getUserId(user) {
   if (!user) return null;
   var id = user.powrId || user._id || user.id;
@@ -267,7 +268,7 @@ function _refreshAccessToken() {
             }
           });
         case 1:
-          url = "".concat(apiUrl, "/auth/refresh-token?projectId=").concat(projectId);
+          url = "".concat(config.resolvePowrApiUrl(apiUrl), "/auth/refresh-token?projectId=").concat(projectId);
           _context3.n = 2;
           return fetch(url, {
             method: 'POST',
@@ -310,19 +311,20 @@ function updatePowrUser(_x5) {
 }
 function _updatePowrUser() {
   _updatePowrUser = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref2) {
-    var apiUrl, projectId, userId, token, refreshToken, body, onTokenRefreshed, activeToken, putUser, response, data, refreshed;
+    var apiUrl, projectId, userId, token, refreshToken, body, onTokenRefreshed, activeToken, host, putUser, response, data, refreshed;
     return _regenerator().w(function (_context5) {
       while (1) switch (_context5.n) {
         case 0:
           apiUrl = _ref2.apiUrl, projectId = _ref2.projectId, userId = _ref2.userId, token = _ref2.token, refreshToken = _ref2.refreshToken, body = _ref2.body, onTokenRefreshed = _ref2.onTokenRefreshed;
           activeToken = token;
+          host = config.resolvePowrApiUrl(apiUrl);
           putUser = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
               var url;
               return _regenerator().w(function (_context4) {
                 while (1) switch (_context4.n) {
                   case 0:
-                    url = "".concat(apiUrl, "/users/").concat(userId, "?projectId=").concat(projectId);
+                    url = "".concat(host, "/users/").concat(userId, "?projectId=").concat(projectId);
                     return _context4.a(2, fetch(url, {
                       method: 'PUT',
                       headers: {
@@ -354,7 +356,7 @@ function _updatePowrUser() {
           }
           _context5.n = 3;
           return refreshAccessToken({
-            apiUrl: apiUrl,
+            apiUrl: host,
             projectId: projectId,
             refreshToken: refreshToken
           });

package/dist/sso/api.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.currentReturnPath = currentReturnPath;
 exports.issueLoginCode = issueLoginCode;
+exports.loginHrefWithNext = loginHrefWithNext;
 exports.loginWithCode = loginWithCode;
 exports.readHandoffParams = readHandoffParams;
 exports.safeNextPath = safeNextPath;
@@ -27,6 +29,32 @@ function safeNextPath(next) {
   return fallback;
 }
 
+/** Current path+search for return-after-login (browser only). */
+function currentReturnPath() {
+  if (typeof window === "undefined") return "/";
+  return "".concat(window.location.pathname).concat(window.location.search || "");
+}
+
+/**
+ * Build `/login?next=…` so post-login can restore the deep link.
+ * Skips when already on login or `next` is empty/unsafe.
+ * @param {string} [returnPath] - defaults to currentReturnPath()
+ * @param {string} [loginPath="/login"]
+ */
+function loginHrefWithNext(returnPath) {
+  var loginPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "/login";
+  var login = loginPath || "/login";
+  var next = returnPath == null ? currentReturnPath() : String(returnPath || "");
+  if (!next || next === login || next.startsWith("".concat(login, "?")) || next.startsWith("".concat(login, "/"))) {
+    return login;
+  }
+  var safe = safeNextPath(next, "");
+  if (!safe || safe === login || safe.startsWith("".concat(login, "?")) || safe.startsWith("".concat(login, "/"))) {
+    return login;
+  }
+  return "".concat(login, "?next=").concat(encodeURIComponent(safe));
+}
+
 /**
  * Issue a one-time login code (caller must already be authenticated).
  * Host `injectProjectId` needs destination `projectId` on the body.

package/dist/sso/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "buildPowrSsoUrl", {
     return _openPowrLogin.buildPowrSsoUrl;
   }
 });
+Object.defineProperty(exports, "currentReturnPath", {
+  enumerable: true,
+  get: function get() {
+    return _api.currentReturnPath;
+  }
+});
 exports["default"] = PowrBaseSso;
 Object.defineProperty(exports, "issueLoginCode", {
   enumerable: true,
@@ -22,6 +28,12 @@ Object.defineProperty(exports, "issueLoginCode", {
     return _api.issueLoginCode;
   }
 });
+Object.defineProperty(exports, "loginHrefWithNext", {
+  enumerable: true,
+  get: function get() {
+    return _api.loginHrefWithNext;
+  }
+});
 Object.defineProperty(exports, "loginWithCode", {
   enumerable: true,
   get: function get() {

package/dist/sso/openPowrLogin.js

@@ -72,12 +72,6 @@ function parseDest(url) {
     return null;
   }
 }
-function resolvePowrApiUrl(apiUrl) {
-  if (apiUrl) return String(apiUrl).replace(/\/$/, "");
-  if (config.powrUrl) return String(config.powrUrl).replace(/\/$/, "");
-  if (config.defaultPowrUrl) return String(config.defaultPowrUrl).replace(/\/$/, "");
-  return "";
-}
 
 /**
  * @param {string} url
@@ -163,7 +157,7 @@ function _openPowrLogin() {
           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);
+          powrApi = config.resolvePowrApiUrl(apiUrl);
           dest = matchPowrTarget(url, origins);
           projectId = projectIdOpt || (dest === null || dest === void 0 ? void 0 : dest.projectId);
           if (!(!dest || !token || !powrApi || !projectId)) {

package/dist/utils/auth.js

@@ -69,6 +69,7 @@ var createAuthHeaders = exports.createAuthHeaders = function createAuthHeaders()
 var apiCall = exports.apiCall = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(apiUrl, endpoint, projectId) {
     var options,
+      host,
       url,
       separator,
       optionHeaders,
@@ -82,12 +83,8 @@ var apiCall = exports.apiCall = /*#__PURE__*/function () {
       while (1) switch (_context.n) {
         case 0:
           options = _args.length > 3 && _args[3] !== undefined ? _args[3] : {};
-          if (apiUrl) {} else if (config.powrUrl) {
-            apiUrl = config.powrUrl;
-          } else {
-            apiUrl = config.defaultPowrUrl;
-          }
-          url = "".concat(apiUrl).concat(endpoint); // Prop wins; NEXT_PUBLIC_PROJECT_ID is the default for every component.
+          host = config.resolvePowrApiUrl(apiUrl);
+          url = "".concat(host).concat(endpoint); // Prop wins; NEXT_PUBLIC_PROJECT_ID is the default for every component.
           if (!projectId && config.projectId) {
             projectId = config.projectId;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "powr-sdk-web",
-    "version": "6.11.0",
+    "version": "6.12.1",
     "main": "dist/index.js",
     "files": [
         "dist"