diff --git a/package-lock.json b/package-lock.json index 54ad6d0..b74462e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@propelauth/express", - "version": "2.1.32", + "version": "2.1.33", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@propelauth/express", - "version": "2.1.32", + "version": "2.1.33", "license": "MIT", "dependencies": { - "@propelauth/node": "^2.1.32" + "@propelauth/node": "^2.1.33" }, "devDependencies": { "@rollup/plugin-commonjs": "^19.0.0", @@ -993,20 +993,18 @@ } }, "node_modules/@propelauth/node": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/@propelauth/node/-/node-2.1.32.tgz", - "integrity": "sha512-/R2HwUOKQcAAxdCmrmkhio0yzbXJf3uDPoZ8ncNg/+iZyYR0Qx5Yv6jxtOnMDX3jPQPbUwdqpVQ1arNz5+XpKQ==", - "license": "MIT", + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@propelauth/node/-/node-2.1.33.tgz", + "integrity": "sha512-FbxSiC3pgJcZwQKRPCoZ0k5a85+1IQEMztXCqwATXvB/yYjmi4T499T9Xslb+Qcyzm9vIdAXttm/6Jo6Fe2GUQ==", "dependencies": { - "@propelauth/node-apis": "^2.1.32", + "@propelauth/node-apis": "^2.1.33", "jose": "^5.2.0" } }, "node_modules/@propelauth/node-apis": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/@propelauth/node-apis/-/node-apis-2.1.32.tgz", - "integrity": "sha512-5/qw37otvg8HZ85ZHnCZiVj4xgM3DHjCJ0t+y4dM/aMl9gfww9OcPlyrdE7vdEBFEO6iKBUJuhMiwNknXDzIbg==", - "license": "MIT" + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@propelauth/node-apis/-/node-apis-2.1.33.tgz", + "integrity": "sha512-WnoiXI9YbZ6uqHJBy1cJrVuSJ0YTqzcAI3+RBX6KzVU6io/9v7xyr1wKw8LHLh8OjZttzT5HXBesfP7Q1MSyGQ==" }, "node_modules/@rollup/plugin-commonjs": { "version": "19.0.2", @@ -6307,18 +6305,18 @@ } }, "@propelauth/node": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/@propelauth/node/-/node-2.1.32.tgz", - "integrity": "sha512-/R2HwUOKQcAAxdCmrmkhio0yzbXJf3uDPoZ8ncNg/+iZyYR0Qx5Yv6jxtOnMDX3jPQPbUwdqpVQ1arNz5+XpKQ==", + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@propelauth/node/-/node-2.1.33.tgz", + "integrity": "sha512-FbxSiC3pgJcZwQKRPCoZ0k5a85+1IQEMztXCqwATXvB/yYjmi4T499T9Xslb+Qcyzm9vIdAXttm/6Jo6Fe2GUQ==", "requires": { - "@propelauth/node-apis": "^2.1.32", + "@propelauth/node-apis": "^2.1.33", "jose": "^5.2.0" } }, "@propelauth/node-apis": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/@propelauth/node-apis/-/node-apis-2.1.32.tgz", - "integrity": "sha512-5/qw37otvg8HZ85ZHnCZiVj4xgM3DHjCJ0t+y4dM/aMl9gfww9OcPlyrdE7vdEBFEO6iKBUJuhMiwNknXDzIbg==" + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@propelauth/node-apis/-/node-apis-2.1.33.tgz", + "integrity": "sha512-WnoiXI9YbZ6uqHJBy1cJrVuSJ0YTqzcAI3+RBX6KzVU6io/9v7xyr1wKw8LHLh8OjZttzT5HXBesfP7Q1MSyGQ==" }, "@rollup/plugin-commonjs": { "version": "19.0.2", diff --git a/package.json b/package.json index 4a884a0..d4c6380 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "type": "git", "url": "https://github.com/PropelAuth/express" }, - "version": "2.1.32", + "version": "2.1.33", "license": "MIT", "keywords": [ "auth", @@ -12,7 +12,7 @@ "user" ], "dependencies": { - "@propelauth/node": "^2.1.32" + "@propelauth/node": "^2.1.33" }, "devDependencies": { "@rollup/plugin-commonjs": "^19.0.0", diff --git a/src/auth.ts b/src/auth.ts index dbe6bbe..f1abd87 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -6,8 +6,8 @@ import { UnauthorizedException, UnexpectedException, User, - UserClass, UserAndOrgMemberInfo, + UserClass, } from "@propelauth/node" import { RequiredOrgInfo } from "@propelauth/node/dist/auth" import { NextFunction, Request, Response } from "express" @@ -37,8 +37,9 @@ export function initAuth(opts: AuthOptions) { const requireOrgMember = createRequireOrgMemberMiddleware( auth.validateAccessTokenAndGetUserWithOrgInfo, auth.validateAccessTokenAndGetUserClass, - debugMode) - + debugMode + ) + const requireOrgMemberWithMinimumRole = createRequireOrgMemberMiddlewareWithMinimumRole( auth.validateAccessTokenAndGetUserWithOrgInfoWithMinimumRole, auth.validateAccessTokenAndGetUserClass, @@ -117,6 +118,8 @@ export function initAuth(opts: AuthOptions) { setSamlIdpMetadata: auth.setSamlIdpMetadata, samlGoLive: auth.samlGoLive, deleteSamlConnection: auth.deleteSamlConnection, + verifyStepUpTotpChallenge: auth.verifyStepUpTotpChallenge, + verifyStepUpGrant: auth.verifyStepUpGrant, } } @@ -148,9 +151,7 @@ function createRequireOrgMemberMiddleware( authorizationHeader: string | undefined, requiredOrgInfo: RequriedOrgInfo ) => Promise, - validateAccessTokenAndGetUserClass: ( - authorizationHeader: string | undefined, - ) => Promise, + validateAccessTokenAndGetUserClass: (authorizationHeader: string | undefined) => Promise, debugMode: boolean ) { return function requireOrgMember(args?: RequireOrgMemberArgs) { @@ -162,9 +163,7 @@ function createRequireOrgMemberMiddleware( return validateAccessTokenAndGetUserWithOrgInfo(authorizationHeader, requiredOrgInfo) }, (authorizationHeader) => { - return validateAccessTokenAndGetUserClass( - authorizationHeader - ) + return validateAccessTokenAndGetUserClass(authorizationHeader) }, debugMode, orgIdExtractor, @@ -179,9 +178,7 @@ function createRequireOrgMemberMiddlewareWithMinimumRole( requiredOrgInfo: RequriedOrgInfo, minimumRole: string ) => Promise, - validateAccessTokenAndGetUserClass: ( - authorizationHeader: string | undefined, - ) => Promise, + validateAccessTokenAndGetUserClass: (authorizationHeader: string | undefined) => Promise, debugMode: boolean ) { return function requireOrgMemberWithMinimumRole(args: RequireOrgMemberWithMinimumRoleArgs) { @@ -197,9 +194,7 @@ function createRequireOrgMemberMiddlewareWithMinimumRole( ) }, (authorizationHeader) => { - return validateAccessTokenAndGetUserClass( - authorizationHeader - ) + return validateAccessTokenAndGetUserClass(authorizationHeader) }, debugMode, orgIdExtractor, @@ -214,9 +209,7 @@ function createRequireOrgMemberMiddlewareWithExactRole( requiredOrgInfo: RequriedOrgInfo, role: string ) => Promise, - validateAccessTokenAndGetUserClass: ( - authorizationHeader: string | undefined, - ) => Promise, + validateAccessTokenAndGetUserClass: (authorizationHeader: string | undefined) => Promise, debugMode: boolean ) { return function requireOrgMemberWithMinimumRole(args: RequireOrgMemberWithExactRoleArgs) { @@ -232,9 +225,7 @@ function createRequireOrgMemberMiddlewareWithExactRole( ) }, (authorizationHeader) => { - return validateAccessTokenAndGetUserClass( - authorizationHeader - ) + return validateAccessTokenAndGetUserClass(authorizationHeader) }, debugMode, orgIdExtractor, @@ -249,9 +240,7 @@ function createRequireOrgMemberMiddlewareWithPermission( requiredOrgInfo: RequriedOrgInfo, permission: string ) => Promise, - validateAccessTokenAndGetUserClass: ( - authorizationHeader: string | undefined, - ) => Promise, + validateAccessTokenAndGetUserClass: (authorizationHeader: string | undefined) => Promise, debugMode: boolean ) { return function requireOrgMemberWithMinimumRole(args: RequireOrgMemberWithPermissionArgs) { @@ -267,9 +256,7 @@ function createRequireOrgMemberMiddlewareWithPermission( ) }, (authorizationHeader) => { - return validateAccessTokenAndGetUserClass( - authorizationHeader - ) + return validateAccessTokenAndGetUserClass(authorizationHeader) }, debugMode, orgIdExtractor, @@ -284,9 +271,7 @@ function createRequireOrgMemberMiddlewareWithAllPermissions( requiredOrgInfo: RequriedOrgInfo, permissions: string[] ) => Promise, - validateAccessTokenAndGetUserClass: ( - authorizationHeader: string | undefined, - ) => Promise, + validateAccessTokenAndGetUserClass: (authorizationHeader: string | undefined) => Promise, debugMode: boolean ) { return function requireOrgMemberWithMinimumRole(args: RequireOrgMemberWithAllPermissionsArgs) { @@ -302,9 +287,7 @@ function createRequireOrgMemberMiddlewareWithAllPermissions( ) }, (authorizationHeader) => { - return validateAccessTokenAndGetUserClass( - authorizationHeader - ) + return validateAccessTokenAndGetUserClass(authorizationHeader) }, debugMode, orgIdExtractor, @@ -318,12 +301,10 @@ function requireOrgMemberGenericMiddleware( authorizationHeader: string | undefined, requiredOrgInfo: RequiredOrgInfo ) => Promise, - validateAccessTokenAndGetUserClass: ( - authorizationHeader: string | undefined, - ) => Promise, + validateAccessTokenAndGetUserClass: (authorizationHeader: string | undefined) => Promise, debugMode: boolean, orgIdExtractor?: (req: Request) => string, - orgNameExtractor?: (req: Request) => string, + orgNameExtractor?: (req: Request) => string ) { return async function (req: Request, res: Response, next: NextFunction) { let requiredOrgInfo: RequiredOrgInfo diff --git a/src/index.ts b/src/index.ts index 1fb5940..4d36ab9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,13 +14,18 @@ export { ChangeUserRoleInOrgException, CreateOrgException, CreateUserException, + FeatureGatedException, ForbiddenException, + IncorrectMfaCodeException, + InvalidRequestFieldsException, MagicLinkCreationException, + MfaNotEnabledException, MigrateUserException, MigrateUserPasswordException, Org, OrgIdToOrgMemberInfo, RemoveUserFromOrgException, + RevokePendingOrgInviteException, toOrgIdToOrgMemberInfo, toUser, UnauthorizedException, @@ -53,6 +58,8 @@ export type { CreateUserRequest, CustomRoleMapping, CustomRoleMappings, + FetchSamlSpMetadataResponse, + IdpProvider, InternalOrgMemberInfo, InternalUser, InviteUserToOrgRequest, @@ -65,24 +72,27 @@ export type { OrgQueryResponse, PersonalApiKeyValidation, RemoveUserFromOrgRequest, + RevokePendingOrgInviteRequest, SamlLoginProvider, + SetSamlIdpMetadataRequest, SocialLoginProvider, + StepUpMfaGrantType, + StepUpMfaVerifyGrantResponse, + StepUpMfaVerifyTotpResponse, TokenVerificationMetadata, UpdateOrgRequest, UpdateUserEmailRequest, UpdateUserMetadataRequest, UpdateUserPasswordRequest, - UserProperties, UserInOrgMetadata, - UsersInOrgPagedResponse, + UserProperties, UserSignupQueryParams, + UsersInOrgPagedResponse, UsersInOrgQuery, UsersPagedResponse, UsersQuery, - RevokePendingOrgInviteRequest, - FetchSamlSpMetadataResponse, - SetSamlIdpMetadataRequest, - IdpProvider, + VerifyStepUpGrantRequest, + VerifyTotpChallengeRequest, } from "@propelauth/node" export { AuthOptions, initAuth } from "./auth" export type { RequireOrgMemberArgs } from "./auth"