@propelauth/nextjs 0.0.112-beta.1 → 0.0.114

package/dist/client/index.d.ts

@@ -2,7 +2,6 @@ import React from 'react';
 
 declare class UserFromToken {
     userId: string;
-    activeOrgId?: string;
     orgIdToOrgMemberInfo?: OrgIdToOrgMemberInfo;
     email: string;
     firstName?: string;
@@ -15,15 +14,12 @@ declare class UserFromToken {
     impersonatorUserId?: string;
     constructor(userId: string, email: string, orgIdToOrgMemberInfo?: OrgIdToOrgMemberInfo, firstName?: string, lastName?: string, username?: string, legacyUserId?: string, impersonatorUserId?: string, properties?: {
         [key: string]: unknown;
-    }, activeOrgId?: string);
-    getActiveOrg(): OrgMemberInfo | undefined;
-    getActiveOrgId(): string | undefined;
+    });
     getOrg(orgId: string): OrgMemberInfo | undefined;
     getOrgByName(orgName: string): OrgMemberInfo | undefined;
     getOrgs(): OrgMemberInfo[];
     isImpersonating(): boolean;
     static fromJSON(json: string): UserFromToken;
-    static fromJwtPayload(payload: InternalUser): UserFromToken;
 }
 type OrgIdToOrgMemberInfo = {
     [orgId: string]: OrgMemberInfo;
@@ -50,33 +46,6 @@ declare class OrgMemberInfo {
     get inheritedRolesPlusCurrentRole(): string[];
     get permissions(): string[];
 }
-type InternalOrgMemberInfo = {
-    org_id: string;
-    org_name: string;
-    org_metadata: {
-        [key: string]: any;
-    };
-    url_safe_org_name: string;
-    user_role: string;
-    inherited_user_roles_plus_current_role: string[];
-    user_permissions: string[];
-};
-type InternalUser = {
-    user_id: string;
-    org_member_info?: InternalOrgMemberInfo;
-    org_id_to_org_member_info?: {
-        [org_id: string]: InternalOrgMemberInfo;
-    };
-    email: string;
-    first_name?: string;
-    last_name?: string;
-    username?: string;
-    properties?: {
-        [key: string]: unknown;
-    };
-    legacy_user_id?: string;
-    impersonatorUserId?: string;
-};
 
 declare class User {
     userId: string;
@@ -88,7 +57,6 @@ declare class User {
     lastName?: string;
     pictureUrl?: string;
     orgIdToOrgMemberInfo?: OrgIdToOrgMemberInfo;
-    activeOrgId?: string;
     mfaEnabled: boolean;
     canCreateOrgs: boolean;
     updatePasswordRequired: boolean;
@@ -99,7 +67,7 @@ declare class User {
     };
     legacyUserId?: string;
     impersonatorUserId?: string;
-    constructor({ userId, email, emailConfirmed, hasPassword, username, firstName, lastName, pictureUrl, orgIdToOrgMemberInfo, activeOrgId, mfaEnabled, canCreateOrgs, updatePasswordRequired, createdAt, lastActiveAt, legacyUserId, properties, impersonatorUserId, }: {
+    constructor({ userId, email, emailConfirmed, hasPassword, username, firstName, lastName, pictureUrl, orgIdToOrgMemberInfo, mfaEnabled, canCreateOrgs, updatePasswordRequired, createdAt, lastActiveAt, legacyUserId, properties, impersonatorUserId, }: {
         userId: string;
         email: string;
         emailConfirmed: boolean;
@@ -109,7 +77,6 @@ declare class User {
         lastName?: string;
         pictureUrl?: string;
         orgIdToOrgMemberInfo?: OrgIdToOrgMemberInfo;
-        activeOrgId?: string;
         mfaEnabled: boolean;
         canCreateOrgs: boolean;
         updatePasswordRequired: boolean;
@@ -121,8 +88,6 @@ declare class User {
         };
         impersonatorUserId?: string;
     });
-    getActiveOrg(): OrgMemberInfo | undefined;
-    getActiveOrgId(): string | undefined;
     getOrg(orgId: string): OrgMemberInfo | undefined;
     getOrgByName(orgName: string): OrgMemberInfo | undefined;
     getOrgs(): OrgMemberInfo[];
@@ -133,30 +98,32 @@ type UseUserLoading = {
     isLoggedIn: never;
     user: never;
     accessToken: never;
-    setActiveOrg: never;
 };
 type UseUserLoggedIn = {
     loading: false;
     isLoggedIn: true;
     user: User;
     accessToken: string;
-    setActiveOrg: (orgId: string) => Promise<User | undefined>;
 };
 type UseUserNotLoggedIn = {
     loading: false;
     isLoggedIn: false;
     user: undefined;
     accessToken: undefined;
-    setActiveOrg: never;
 };
 type UseUser = UseUserLoading | UseUserLoggedIn | UseUserNotLoggedIn;
 declare function useUser(): UseUser;
 
 interface RedirectToSignupOptions {
-    postSignupRedirectPath: string;
+    postSignupRedirectPath?: string;
+    userSignupQueryParameters?: Record<string, string>;
 }
 interface RedirectToLoginOptions {
-    postLoginRedirectPath: string;
+    postLoginRedirectPath?: string;
+    userSignupQueryParameters?: Record<string, string>;
+}
+interface RedirectOptions {
+    redirectBackToUrl?: string;
 }
 type AuthProviderProps = {
     authUrl: string;
@@ -168,10 +135,10 @@ declare const AuthProvider: (props: AuthProviderProps) => React.JSX.Element;
 declare function useHostedPageUrls(): {
     getLoginPageUrl: (opts?: RedirectToLoginOptions | undefined) => string;
     getSignupPageUrl: (opts?: RedirectToSignupOptions | undefined) => string;
-    getAccountPageUrl: () => string;
-    getOrgPageUrl: (orgId?: string | undefined) => string;
-    getCreateOrgPageUrl: () => string;
-    getSetupSAMLPageUrl: (orgId: string) => string;
+    getAccountPageUrl: (opts?: RedirectOptions | undefined) => string;
+    getOrgPageUrl: (orgId?: string | undefined, opts?: RedirectOptions | undefined) => string;
+    getCreateOrgPageUrl: (opts?: RedirectOptions | undefined) => string;
+    getSetupSAMLPageUrl: (orgId: string, opts?: RedirectOptions | undefined) => string;
 };
 
 declare function useLogoutFunction(): () => Promise<void>;
@@ -179,9 +146,10 @@ declare function useLogoutFunction(): () => Promise<void>;
 declare function useRedirectFunctions(): {
     redirectToSignupPage: (opts?: RedirectToSignupOptions | undefined) => void;
     redirectToLoginPage: (opts?: RedirectToLoginOptions | undefined) => void;
-    redirectToAccountPage: () => void;
-    redirectToOrgPage: (orgId?: string | undefined) => void;
-    redirectToCreateOrgPage: () => void;
+    redirectToAccountPage: (opts?: RedirectOptions | undefined) => void;
+    redirectToOrgPage: (orgId?: string | undefined, opts?: RedirectOptions | undefined) => void;
+    redirectToCreateOrgPage: (opts?: RedirectOptions | undefined) => void;
+    redirectToSetupSAMLPage: (orgId: string, opts?: RedirectOptions | undefined) => void;
 };
 interface RedirectProps {
     children?: React.ReactNode;

package/dist/client/index.js

@@ -84,9 +84,8 @@ module.exports = __toCommonJS(client_exports);
 
 // src/user.ts
 var UserFromToken = class {
-  constructor(userId, email, orgIdToOrgMemberInfo, firstName, lastName, username, legacyUserId, impersonatorUserId, properties, activeOrgId) {
+  constructor(userId, email, orgIdToOrgMemberInfo, firstName, lastName, username, legacyUserId, impersonatorUserId, properties) {
     this.userId = userId;
-    this.activeOrgId = activeOrgId;
     this.orgIdToOrgMemberInfo = orgIdToOrgMemberInfo;
     this.email = email;
     this.firstName = firstName;
@@ -96,15 +95,6 @@ var UserFromToken = class {
     this.impersonatorUserId = impersonatorUserId;
     this.properties = properties;
   }
-  getActiveOrg() {
-    if (!this.activeOrgId || !this.orgIdToOrgMemberInfo) {
-      return void 0;
-    }
-    return this.orgIdToOrgMemberInfo[this.activeOrgId];
-  }
-  getActiveOrgId() {
-    return this.activeOrgId;
-  }
   getOrg(orgId) {
     if (!this.orgIdToOrgMemberInfo) {
       return void 0;
@@ -137,7 +127,9 @@ var UserFromToken = class {
     const obj = JSON.parse(json);
     const orgIdToOrgMemberInfo = {};
     for (const orgId in obj.orgIdToOrgMemberInfo) {
-      orgIdToOrgMemberInfo[orgId] = OrgMemberInfo.fromJSON(JSON.stringify(obj.orgIdToOrgMemberInfo[orgId]));
+      orgIdToOrgMemberInfo[orgId] = OrgMemberInfo.fromJSON(
+        JSON.stringify(obj.orgIdToOrgMemberInfo[orgId])
+      );
     }
     return new UserFromToken(
       obj.userId,
@@ -151,29 +143,6 @@ var UserFromToken = class {
       obj.properties
     );
   }
-  static fromJwtPayload(payload) {
-    let activeOrgId;
-    let orgIdToOrgMemberInfo;
-    if (payload.org_member_info) {
-      activeOrgId = payload.org_member_info.org_id;
-      orgIdToOrgMemberInfo = toOrgIdToOrgMemberInfo({ [activeOrgId]: payload.org_member_info });
-    } else {
-      activeOrgId = void 0;
-      orgIdToOrgMemberInfo = toOrgIdToOrgMemberInfo(payload.org_id_to_org_member_info);
-    }
-    return new UserFromToken(
-      payload.user_id,
-      payload.email,
-      orgIdToOrgMemberInfo,
-      payload.first_name,
-      payload.last_name,
-      payload.username,
-      payload.legacy_user_id,
-      payload.impersonatorUserId,
-      payload.properties,
-      activeOrgId
-    );
-  }
 };
 var OrgMemberInfo = class {
   constructor(orgId, orgName, orgMetadata, urlSafeOrgName, userAssignedRole, userInheritedRolesPlusCurrentRole, userPermissions) {
@@ -323,7 +292,6 @@ var User = class {
     lastName,
     pictureUrl,
     orgIdToOrgMemberInfo,
-    activeOrgId,
     mfaEnabled,
     canCreateOrgs,
     updatePasswordRequired,
@@ -342,7 +310,6 @@ var User = class {
     this.lastName = lastName;
     this.pictureUrl = pictureUrl;
     this.orgIdToOrgMemberInfo = orgIdToOrgMemberInfo;
-    this.activeOrgId = activeOrgId;
     this.mfaEnabled = mfaEnabled;
     this.canCreateOrgs = canCreateOrgs;
     this.updatePasswordRequired = updatePasswordRequired;
@@ -352,15 +319,6 @@ var User = class {
     this.properties = properties;
     this.impersonatorUserId = impersonatorUserId;
   }
-  getActiveOrg() {
-    if (!this.activeOrgId) {
-      return void 0;
-    }
-    return this.getOrg(this.activeOrgId);
-  }
-  getActiveOrgId() {
-    return this.activeOrgId;
-  }
   getOrg(orgId) {
     var _a;
     return (_a = this.orgIdToOrgMemberInfo) == null ? void 0 : _a[orgId];
@@ -399,24 +357,21 @@ function useUser() {
       loading: true,
       isLoggedIn: void 0,
       user: void 0,
-      accessToken: void 0,
-      setActiveOrg: void 0
+      accessToken: void 0
     };
   } else if (userAndAccessToken.user) {
     return {
       loading: false,
       isLoggedIn: true,
       user: userAndAccessToken.user,
-      accessToken: userAndAccessToken.accessToken,
-      setActiveOrg: context.setActiveOrg
+      accessToken: userAndAccessToken.accessToken
     };
   } else {
     return {
       loading: false,
       isLoggedIn: false,
       user: void 0,
-      accessToken: void 0,
-      setActiveOrg: void 0
+      accessToken: void 0
     };
   }
 }
@@ -486,7 +441,7 @@ var AuthProvider = (props) => {
     function refreshAuthInfo2() {
       return __async(this, null, function* () {
         const action = yield apiGetUserInfo();
-        if (!didCancel) {
+        if (!didCancel && !action.error) {
           dispatch(action);
         }
       });
@@ -498,11 +453,23 @@ var AuthProvider = (props) => {
   }, []);
   (0, import_react2.useEffect)(() => {
     let didCancel = false;
+    let retryTimer = void 0;
+    function clearAndSetRetryTimer() {
+      if (retryTimer) {
+        clearTimeout(retryTimer);
+      }
+      retryTimer = setTimeout(refreshToken, 30 * 1e3);
+    }
     function refreshToken() {
       return __async(this, null, function* () {
         const action = yield apiGetUserInfo();
-        if (!didCancel) {
+        if (didCancel) {
+          return;
+        }
+        if (!action.error) {
           dispatch(action);
+        } else if (action.error === "unexpected") {
+          clearAndSetRetryTimer();
         }
       });
     }
@@ -522,6 +489,9 @@ var AuthProvider = (props) => {
     return () => {
       didCancel = true;
       clearInterval(interval);
+      if (retryTimer) {
+        clearTimeout(retryTimer);
+      }
       if (hasWindow()) {
         window.removeEventListener("storage", onStorageEvent);
         window.removeEventListener("online", refreshToken);
@@ -551,25 +521,31 @@ var AuthProvider = (props) => {
     }
     return "/api/auth/signup";
   };
-  const getAccountPageUrl = (0, import_react2.useCallback)(() => {
-    return `${props.authUrl}/account`;
-  }, [props.authUrl]);
+  const getAccountPageUrl = (0, import_react2.useCallback)(
+    (opts) => {
+      return addReturnToPath(`${props.authUrl}/account`, opts == null ? void 0 : opts.redirectBackToUrl);
+    },
+    [props.authUrl]
+  );
   const getOrgPageUrl = (0, import_react2.useCallback)(
-    (orgId) => {
+    (orgId, opts) => {
       if (orgId) {
-        return `${props.authUrl}/org?id=${orgId}`;
+        return addReturnToPath(`${props.authUrl}/org?id=${orgId}`, opts == null ? void 0 : opts.redirectBackToUrl);
       } else {
-        return `${props.authUrl}/org`;
+        return addReturnToPath(`${props.authUrl}/org`, opts == null ? void 0 : opts.redirectBackToUrl);
       }
     },
     [props.authUrl]
   );
-  const getCreateOrgPageUrl = (0, import_react2.useCallback)(() => {
-    return `${props.authUrl}/create_org`;
-  }, [props.authUrl]);
+  const getCreateOrgPageUrl = (0, import_react2.useCallback)(
+    (opts) => {
+      return addReturnToPath(`${props.authUrl}/create_org`, opts == null ? void 0 : opts.redirectBackToUrl);
+    },
+    [props.authUrl]
+  );
   const getSetupSAMLPageUrl = (0, import_react2.useCallback)(
-    (orgId) => {
-      return `${props.authUrl}/saml?id=${orgId}`;
+    (orgId, opts) => {
+      return addReturnToPath(`${props.authUrl}/saml?id=${orgId}`, opts == null ? void 0 : opts.redirectBackToUrl);
     },
     [props.authUrl]
   );
@@ -578,27 +554,19 @@ var AuthProvider = (props) => {
   };
   const redirectToLoginPage = (opts) => redirectTo(getLoginPageUrl(opts));
   const redirectToSignupPage = (opts) => redirectTo(getSignupPageUrl(opts));
-  const redirectToAccountPage = () => redirectTo(getAccountPageUrl());
-  const redirectToOrgPage = (orgId) => redirectTo(getOrgPageUrl(orgId));
-  const redirectToCreateOrgPage = () => redirectTo(getCreateOrgPageUrl());
-  const redirectToSetupSAMLPage = (orgId) => redirectTo(getSetupSAMLPageUrl(orgId));
-  const refreshAuthInfo = (0, import_react2.useCallback)(() => __async(void 0, null, function* () {
+  const redirectToAccountPage = (opts) => redirectTo(getAccountPageUrl(opts));
+  const redirectToOrgPage = (orgId, opts) => redirectTo(getOrgPageUrl(orgId, opts));
+  const redirectToCreateOrgPage = (opts) => redirectTo(getCreateOrgPageUrl(opts));
+  const redirectToSetupSAMLPage = (orgId, opts) => redirectTo(getSetupSAMLPageUrl(orgId, opts));
+  const refreshAuthInfo = () => __async(void 0, null, function* () {
     const action = yield apiGetUserInfo();
-    dispatch(action);
-    return action.user;
-  }), [dispatch]);
-  const setActiveOrg = (0, import_react2.useCallback)(
-    (orgId) => __async(void 0, null, function* () {
-      const action = yield apiPostSetActiveOrg(orgId);
-      if (action.error === "not_in_org") {
-        return void 0;
-      } else {
-        dispatch(action);
-        return action.user;
-      }
-    }),
-    [dispatch]
-  );
+    if (action.error) {
+      throw new Error("Failed to refresh token");
+    } else {
+      dispatch(action);
+      return action.user;
+    }
+  });
   const value = {
     loading: authState.loading,
     userAndAccessToken: authState.userAndAccessToken,
@@ -615,8 +583,7 @@ var AuthProvider = (props) => {
     getOrgPageUrl,
     getCreateOrgPageUrl,
     getSetupSAMLPageUrl,
-    refreshAuthInfo,
-    setActiveOrg
+    refreshAuthInfo
   };
   return /* @__PURE__ */ import_react2.default.createElement(AuthContext.Provider, { value }, props.children);
 };
@@ -631,7 +598,7 @@ function apiGetUserInfo() {
         credentials: "include"
       });
       if (userInfoResponse.ok) {
-        const { userinfo, accessToken, impersonatorUserId, activeOrgId } = yield userInfoResponse.json();
+        const { userinfo, accessToken, impersonatorUserId } = yield userInfoResponse.json();
         const user = new User({
           userId: userinfo.user_id,
           email: userinfo.email,
@@ -642,7 +609,6 @@ function apiGetUserInfo() {
           lastName: userinfo.last_name,
           pictureUrl: userinfo.picture_url,
           orgIdToOrgMemberInfo: toOrgIdToOrgMemberInfo(userinfo.org_id_to_org_info),
-          activeOrgId,
           mfaEnabled: userinfo.mfa_enabled,
           canCreateOrgs: userinfo.can_create_orgs,
           updatePasswordRequired: userinfo.update_password_required,
@@ -651,63 +617,35 @@ function apiGetUserInfo() {
           properties: userinfo.properties,
           impersonatorUserId
         });
-        return { user, accessToken };
+        return { user, accessToken, error: void 0 };
       } else if (userInfoResponse.status === 401) {
-        return { user: void 0, accessToken: void 0 };
+        return { user: void 0, accessToken: void 0, error: void 0 };
       } else {
         console.info("Failed to refresh token", userInfoResponse);
+        return { error: "unexpected" };
       }
     } catch (e) {
       console.info("Failed to refresh token", e);
+      return { error: "unexpected" };
     }
-    throw new Error("Failed to refresh token");
-  });
-}
-function apiPostSetActiveOrg(orgId) {
-  return __async(this, null, function* () {
-    try {
-      const queryParams = new URLSearchParams({ active_org_id: orgId }).toString();
-      const url = `/api/auth/set-active-org?${queryParams}`;
-      const userInfoResponse = yield fetch(url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        credentials: "include"
-      });
-      if (userInfoResponse.ok) {
-        const { userinfo, accessToken, impersonatorUserId, activeOrgId } = yield userInfoResponse.json();
-        const user = new User({
-          userId: userinfo.user_id,
-          email: userinfo.email,
-          emailConfirmed: userinfo.email_confirmed,
-          hasPassword: userinfo.has_password,
-          username: userinfo.username,
-          firstName: userinfo.first_name,
-          lastName: userinfo.last_name,
-          pictureUrl: userinfo.picture_url,
-          orgIdToOrgMemberInfo: toOrgIdToOrgMemberInfo(userinfo.org_id_to_org_info),
-          activeOrgId,
-          mfaEnabled: userinfo.mfa_enabled,
-          canCreateOrgs: userinfo.can_create_orgs,
-          updatePasswordRequired: userinfo.update_password_required,
-          createdAt: userinfo.created_at,
-          lastActiveAt: userinfo.last_active_at,
-          properties: userinfo.properties,
-          impersonatorUserId
-        });
-        return { user, accessToken, error: void 0 };
-      } else if (userInfoResponse.status === 401) {
-        return { error: "not_in_org" };
-      } else {
-        console.info("Failed to set active org", userInfoResponse);
-      }
-    } catch (e) {
-      console.info("Failed to set active org", e);
-    }
-    throw new Error("Failed to set active org");
   });
 }
+var encodeBase64 = (str) => {
+  const encode = window ? window.btoa : btoa;
+  return encode(str);
+};
+var addReturnToPath = (url, returnToPath) => {
+  if (!returnToPath) {
+    return url;
+  }
+  let qs = new URLSearchParams();
+  qs.set("rt", encodeBase64(returnToPath));
+  if (url.includes("?")) {
+    return `${url}&${qs.toString()}`;
+  } else {
+    return `${url}?${qs.toString()}`;
+  }
+};
 
 // src/client/useHostedPageUrls.tsx
 var import_react3 = require("react");
@@ -757,14 +695,16 @@ function useRedirectFunctions() {
     redirectToSignupPage,
     redirectToLoginPage,
     redirectToOrgPage,
-    redirectToCreateOrgPage
+    redirectToCreateOrgPage,
+    redirectToSetupSAMLPage
   } = context;
   return {
     redirectToSignupPage,
     redirectToLoginPage,
     redirectToAccountPage,
     redirectToOrgPage,
-    redirectToCreateOrgPage
+    redirectToCreateOrgPage,
+    redirectToSetupSAMLPage
   };
 }
 function RedirectToSignup({ children }) {