@@ -1043,8 +1043,7 @@ function basic_security_check (req, res, next)
10431043 // replace all version with "/v1/"
10441044
10451045 const endpoint = req . url . split ( "?" ) [ 0 ] ;
1046- const api = endpoint . replace ( / \/ v [ 1 - 2 ] \/ / , "/v1/" ) ;
1047- const min_class_required = MIN_CERT_CLASS_REQUIRED [ api ] ;
1046+ const min_class_required = MIN_CERT_CLASS_REQUIRED [ endpoint ] ;
10481047
10491048 if ( config . LAUNCH_ADMIN_PANEL )
10501049 process . send ( endpoint ) ;
@@ -1100,7 +1099,7 @@ function basic_security_check (req, res, next)
11001099 {
11011100 res . locals . untrusted = true ;
11021101
1103- if ( api . startsWith ( "/marketplace/" ) )
1102+ if ( endpoint . startsWith ( "/marketplace/" ) )
11041103 {
11051104 return ERROR (
11061105 res , 403 ,
@@ -1147,7 +1146,7 @@ function basic_security_check (req, res, next)
11471146 except in case of "/certificate-info"
11481147 */
11491148
1150- if ( ! api . endsWith ( "/certificate-info" ) )
1149+ if ( ! endpoint . endsWith ( "/certificate-info" ) )
11511150 {
11521151 return ERROR (
11531152 res , 403 ,
@@ -1303,7 +1302,7 @@ function basic_security_check (req, res, next)
13031302
13041303 if ( min_class_required === 1 )
13051304 {
1306- if ( ! api . endsWith ( "/certificate-info" ) )
1305+ if ( ! endpoint . endsWith ( "/certificate-info" ) )
13071306 {
13081307 res . locals . cert_class = 1 ;
13091308 }
@@ -1452,7 +1451,7 @@ function to_array (o)
14521451
14531452/* --- Auth APIs --- */
14541453
1455- app . post ( "/auth/v[1-2] /token" , ( req , res ) => {
1454+ app . post ( "/auth/v1 /token" , ( req , res ) => {
14561455
14571456 const cert = res . locals . cert ;
14581457 const cert_class = res . locals . cert_class ;
@@ -2250,7 +2249,7 @@ app.post("/auth/v[1-2]/token", (req, res) => {
22502249 } ) ;
22512250} ) ;
22522251
2253- app . post ( "/auth/v[1-2] /token/introspect" , ( req , res ) => {
2252+ app . post ( "/auth/v1 /token/introspect" , ( req , res ) => {
22542253
22552254 const cert = res . locals . cert ;
22562255 const body = res . locals . body ;
@@ -2537,7 +2536,7 @@ app.post("/auth/v[1-2]/token/introspect", (req, res) => {
25372536 ) ;
25382537} ) ;
25392538
2540- app . post ( "/auth/v[1-2] /token/revoke" , ( req , res ) => {
2539+ app . post ( "/auth/v1 /token/revoke" , ( req , res ) => {
25412540
25422541 const id = res . locals . email ;
25432542 const body = res . locals . body ;
@@ -2704,7 +2703,7 @@ app.post("/auth/v[1-2]/token/revoke", (req, res) => {
27042703 return SUCCESS ( res , response ) ;
27052704} ) ;
27062705
2707- app . post ( "/auth/v[1-2] /token/revoke-all" , ( req , res ) => {
2706+ app . post ( "/auth/v1 /token/revoke-all" , ( req , res ) => {
27082707
27092708 const id = res . locals . email ;
27102709 const body = res . locals . body ;
@@ -2804,7 +2803,7 @@ app.post("/auth/v[1-2]/token/revoke-all", (req, res) => {
28042803 ) ;
28052804} ) ;
28062805
2807- app . post ( "/auth/v[1-2] /acl/set" , ( req , res ) => {
2806+ app . post ( "/auth/v1 /acl/set" , ( req , res ) => {
28082807
28092808 const body = res . locals . body ;
28102809 const provider_id = res . locals . email ;
@@ -2918,7 +2917,7 @@ app.post("/auth/v[1-2]/acl/set", (req, res) => {
29182917 } ) ;
29192918} ) ;
29202919
2921- app . post ( "/auth/v[1-2] /acl/append" , ( req , res ) => {
2920+ app . post ( "/auth/v1 /acl/append" , ( req , res ) => {
29222921
29232922 const body = res . locals . body ;
29242923 const provider_id = res . locals . email ;
@@ -3064,7 +3063,7 @@ app.post("/auth/v[1-2]/acl/append", (req, res) => {
30643063 } ) ;
30653064} ) ;
30663065
3067- app . post ( "/auth/v[1-2] /acl" , ( req , res ) => {
3066+ app . post ( "/auth/v1 /acl" , ( req , res ) => {
30683067
30693068 const provider_id = res . locals . email ;
30703069
@@ -3118,7 +3117,7 @@ app.post("/auth/v[1-2]/acl", (req, res) => {
31183117 } ) ;
31193118} ) ;
31203119
3121- app . post ( "/auth/v[1-2] /acl/revert" , ( req , res ) => {
3120+ app . post ( "/auth/v1 /acl/revert" , ( req , res ) => {
31223121
31233122 const provider_id = res . locals . email ;
31243123
@@ -3202,7 +3201,7 @@ app.post("/auth/v[1-2]/acl/revert", (req, res) => {
32023201 } ) ;
32033202} ) ;
32043203
3205- app . post ( "/auth/v[1-2] /audit/tokens" , ( req , res ) => {
3204+ app . post ( "/auth/v1 /audit/tokens" , ( req , res ) => {
32063205
32073206 const id = res . locals . email ;
32083207 const body = res . locals . body ;
@@ -3341,7 +3340,7 @@ app.post("/auth/v[1-2]/audit/tokens", (req, res) => {
33413340 } ) ;
33423341} ) ;
33433342
3344- app . post ( "/auth/v[1-2] /group/add" , ( req , res ) => {
3343+ app . post ( "/auth/v1 /group/add" , ( req , res ) => {
33453344
33463345 const body = res . locals . body ;
33473346 const provider_id = res . locals . email ;
@@ -3400,7 +3399,7 @@ app.post("/auth/v[1-2]/group/add", (req, res) => {
34003399 } ) ;
34013400} ) ;
34023401
3403- app . post ( "/auth/v[1-2] /group/list" , ( req , res ) => {
3402+ app . post ( "/auth/v1 /group/list" , ( req , res ) => {
34043403
34053404 const body = res . locals . body ;
34063405 const provider_id = res . locals . email ;
@@ -3488,7 +3487,7 @@ app.post("/auth/v[1-2]/group/list", (req, res) => {
34883487 }
34893488} ) ;
34903489
3491- app . post ( "/auth/v[1-2] /group/delete" , ( req , res ) => {
3490+ app . post ( "/auth/v1 /group/delete" , ( req , res ) => {
34923491
34933492 const body = res . locals . body ;
34943493 const provider_id = res . locals . email ;
@@ -3558,7 +3557,7 @@ app.post("/auth/v[1-2]/group/delete", (req, res) => {
35583557 } ) ;
35593558} ) ;
35603559
3561- app . post ( "/auth/v[1-2] /certificate-info" , ( req , res ) => {
3560+ app . post ( "/auth/v1 /certificate-info" , ( req , res ) => {
35623561
35633562 const cert = res . locals . cert ;
35643563
@@ -3574,7 +3573,7 @@ app.post("/auth/v[1-2]/certificate-info", (req, res) => {
35743573
35753574/* --- Marketplace APIs --- */
35763575
3577- app . post ( "/marketplace/v[1-2] /credit/info" , ( req , res ) => {
3576+ app . post ( "/marketplace/v1 /credit/info" , ( req , res ) => {
35783577
35793578 const id = res . locals . email ;
35803579 const cert = res . locals . cert ;
@@ -3653,7 +3652,7 @@ app.post("/marketplace/v[1-2]/credit/info", (req, res) => {
36533652 } ) ;
36543653} ) ;
36553654
3656- app . post ( "/marketplace/v[1-2] /credit/topup" , ( req , res ) => {
3655+ app . post ( "/marketplace/v1 /credit/topup" , ( req , res ) => {
36573656
36583657 const id = res . locals . email ;
36593658 const body = res . locals . body ;
@@ -3994,7 +3993,7 @@ app.get("/marketplace/topup-success", (req, res) => {
39943993 } ) ;
39953994} ) ;
39963995
3997- app . post ( "/marketplace/v[1-2] /confirm-payment" , ( req , res ) => {
3996+ app . post ( "/marketplace/v1 /confirm-payment" , ( req , res ) => {
39983997
39993998 const id = res . locals . email ;
40003999 const body = res . locals . body ;
@@ -4090,7 +4089,7 @@ app.post("/marketplace/v[1-2]/confirm-payment", (req, res) => {
40904089 ) ;
40914090} ) ;
40924091
4093- app . post ( "/marketplace/v[1-2] /audit/credits" , ( req , res ) => {
4092+ app . post ( "/marketplace/v1 /audit/credits" , ( req , res ) => {
40944093
40954094 const id = res . locals . email ;
40964095 const body = res . locals . body ;
@@ -4234,7 +4233,7 @@ app.post("/marketplace/v[1-2]/audit/credits", (req, res) => {
42344233 } ) ;
42354234} ) ;
42364235
4237- app . post ( "/marketplace/v[1-2] /credit/transfer" , ( req , res ) => {
4236+ app . post ( "/marketplace/v1 /credit/transfer" , ( req , res ) => {
42384237
42394238 const id = res . locals . email ;
42404239 const body = res . locals . body ;
0 commit comments