66 UnauthorizedException ,
77 UnexpectedException ,
88 User ,
9- UserClass ,
109 UserAndOrgMemberInfo ,
10+ UserClass ,
1111} from "@propelauth/node"
1212import { RequiredOrgInfo } from "@propelauth/node/dist/auth"
1313import { NextFunction , Request , Response } from "express"
@@ -37,8 +37,9 @@ export function initAuth(opts: AuthOptions) {
3737 const requireOrgMember = createRequireOrgMemberMiddleware (
3838 auth . validateAccessTokenAndGetUserWithOrgInfo ,
3939 auth . validateAccessTokenAndGetUserClass ,
40- debugMode )
41-
40+ debugMode
41+ )
42+
4243 const requireOrgMemberWithMinimumRole = createRequireOrgMemberMiddlewareWithMinimumRole (
4344 auth . validateAccessTokenAndGetUserWithOrgInfoWithMinimumRole ,
4445 auth . validateAccessTokenAndGetUserClass ,
@@ -117,6 +118,8 @@ export function initAuth(opts: AuthOptions) {
117118 setSamlIdpMetadata : auth . setSamlIdpMetadata ,
118119 samlGoLive : auth . samlGoLive ,
119120 deleteSamlConnection : auth . deleteSamlConnection ,
121+ verifyStepUpTotpChallenge : auth . verifyStepUpTotpChallenge ,
122+ verifyStepUpGrant : auth . verifyStepUpGrant ,
120123 }
121124}
122125
@@ -148,9 +151,7 @@ function createRequireOrgMemberMiddleware(
148151 authorizationHeader : string | undefined ,
149152 requiredOrgInfo : RequriedOrgInfo
150153 ) => Promise < UserAndOrgMemberInfo > ,
151- validateAccessTokenAndGetUserClass : (
152- authorizationHeader : string | undefined ,
153- ) => Promise < UserClass > ,
154+ validateAccessTokenAndGetUserClass : ( authorizationHeader : string | undefined ) => Promise < UserClass > ,
154155 debugMode : boolean
155156) {
156157 return function requireOrgMember ( args ?: RequireOrgMemberArgs ) {
@@ -162,9 +163,7 @@ function createRequireOrgMemberMiddleware(
162163 return validateAccessTokenAndGetUserWithOrgInfo ( authorizationHeader , requiredOrgInfo )
163164 } ,
164165 ( authorizationHeader ) => {
165- return validateAccessTokenAndGetUserClass (
166- authorizationHeader
167- )
166+ return validateAccessTokenAndGetUserClass ( authorizationHeader )
168167 } ,
169168 debugMode ,
170169 orgIdExtractor ,
@@ -179,9 +178,7 @@ function createRequireOrgMemberMiddlewareWithMinimumRole(
179178 requiredOrgInfo : RequriedOrgInfo ,
180179 minimumRole : string
181180 ) => Promise < UserAndOrgMemberInfo > ,
182- validateAccessTokenAndGetUserClass : (
183- authorizationHeader : string | undefined ,
184- ) => Promise < UserClass > ,
181+ validateAccessTokenAndGetUserClass : ( authorizationHeader : string | undefined ) => Promise < UserClass > ,
185182 debugMode : boolean
186183) {
187184 return function requireOrgMemberWithMinimumRole ( args : RequireOrgMemberWithMinimumRoleArgs ) {
@@ -197,9 +194,7 @@ function createRequireOrgMemberMiddlewareWithMinimumRole(
197194 )
198195 } ,
199196 ( authorizationHeader ) => {
200- return validateAccessTokenAndGetUserClass (
201- authorizationHeader
202- )
197+ return validateAccessTokenAndGetUserClass ( authorizationHeader )
203198 } ,
204199 debugMode ,
205200 orgIdExtractor ,
@@ -214,9 +209,7 @@ function createRequireOrgMemberMiddlewareWithExactRole(
214209 requiredOrgInfo : RequriedOrgInfo ,
215210 role : string
216211 ) => Promise < UserAndOrgMemberInfo > ,
217- validateAccessTokenAndGetUserClass : (
218- authorizationHeader : string | undefined ,
219- ) => Promise < UserClass > ,
212+ validateAccessTokenAndGetUserClass : ( authorizationHeader : string | undefined ) => Promise < UserClass > ,
220213 debugMode : boolean
221214) {
222215 return function requireOrgMemberWithMinimumRole ( args : RequireOrgMemberWithExactRoleArgs ) {
@@ -232,9 +225,7 @@ function createRequireOrgMemberMiddlewareWithExactRole(
232225 )
233226 } ,
234227 ( authorizationHeader ) => {
235- return validateAccessTokenAndGetUserClass (
236- authorizationHeader
237- )
228+ return validateAccessTokenAndGetUserClass ( authorizationHeader )
238229 } ,
239230 debugMode ,
240231 orgIdExtractor ,
@@ -249,9 +240,7 @@ function createRequireOrgMemberMiddlewareWithPermission(
249240 requiredOrgInfo : RequriedOrgInfo ,
250241 permission : string
251242 ) => Promise < UserAndOrgMemberInfo > ,
252- validateAccessTokenAndGetUserClass : (
253- authorizationHeader : string | undefined ,
254- ) => Promise < UserClass > ,
243+ validateAccessTokenAndGetUserClass : ( authorizationHeader : string | undefined ) => Promise < UserClass > ,
255244 debugMode : boolean
256245) {
257246 return function requireOrgMemberWithMinimumRole ( args : RequireOrgMemberWithPermissionArgs ) {
@@ -267,9 +256,7 @@ function createRequireOrgMemberMiddlewareWithPermission(
267256 )
268257 } ,
269258 ( authorizationHeader ) => {
270- return validateAccessTokenAndGetUserClass (
271- authorizationHeader
272- )
259+ return validateAccessTokenAndGetUserClass ( authorizationHeader )
273260 } ,
274261 debugMode ,
275262 orgIdExtractor ,
@@ -284,9 +271,7 @@ function createRequireOrgMemberMiddlewareWithAllPermissions(
284271 requiredOrgInfo : RequriedOrgInfo ,
285272 permissions : string [ ]
286273 ) => Promise < UserAndOrgMemberInfo > ,
287- validateAccessTokenAndGetUserClass : (
288- authorizationHeader : string | undefined ,
289- ) => Promise < UserClass > ,
274+ validateAccessTokenAndGetUserClass : ( authorizationHeader : string | undefined ) => Promise < UserClass > ,
290275 debugMode : boolean
291276) {
292277 return function requireOrgMemberWithMinimumRole ( args : RequireOrgMemberWithAllPermissionsArgs ) {
@@ -302,9 +287,7 @@ function createRequireOrgMemberMiddlewareWithAllPermissions(
302287 )
303288 } ,
304289 ( authorizationHeader ) => {
305- return validateAccessTokenAndGetUserClass (
306- authorizationHeader
307- )
290+ return validateAccessTokenAndGetUserClass ( authorizationHeader )
308291 } ,
309292 debugMode ,
310293 orgIdExtractor ,
@@ -318,12 +301,10 @@ function requireOrgMemberGenericMiddleware(
318301 authorizationHeader : string | undefined ,
319302 requiredOrgInfo : RequiredOrgInfo
320303 ) => Promise < UserAndOrgMemberInfo > ,
321- validateAccessTokenAndGetUserClass : (
322- authorizationHeader : string | undefined ,
323- ) => Promise < UserClass > ,
304+ validateAccessTokenAndGetUserClass : ( authorizationHeader : string | undefined ) => Promise < UserClass > ,
324305 debugMode : boolean ,
325306 orgIdExtractor ?: ( req : Request ) => string ,
326- orgNameExtractor ?: ( req : Request ) => string ,
307+ orgNameExtractor ?: ( req : Request ) => string
327308) {
328309 return async function ( req : Request , res : Response , next : NextFunction ) {
329310 let requiredOrgInfo : RequiredOrgInfo
0 commit comments