Uniformize the flag for Agents (*auth to *authorize)

htrendev · Mar 29, 2020 · 6d96148 · 6d96148
1 parent 7cdc7ef
commit 6d96148
Show file tree

Hide file tree

Showing 53 changed files with 63 additions and 63 deletions.
diff --git a/agents/diamagent.go b/agents/diamagent.go
@@ -269,7 +269,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
 	cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
 	var reqType string
 	for _, typ := range []string{
-		utils.MetaDryRun, utils.MetaAuth,
+		utils.MetaDryRun, utils.MetaAuthorize,
 		utils.MetaInitiate, utils.MetaUpdate,
 		utils.MetaTerminate, utils.MetaMessage,
 		utils.MetaCDRs, utils.MetaEvent, utils.META_NONE} {
@@ -279,7 +279,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
 		}
 	}
 	cgrArgs := cgrEv.ExtractArgs(reqProcessor.Flags.HasKey(utils.MetaDispatchers),
-		reqType == utils.MetaAuth || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
+		reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
 	if reqProcessor.Flags.HasKey(utils.MetaLog) {
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> LOG, processorID: %s, diameter message: %s",
@@ -293,7 +293,7 @@ func (da *DiameterAgent) processRequest(reqProcessor *config.RequestProcessor,
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> DRY_RUN, processorID: %s, DiameterMessage: %s",
 				utils.DiameterAgent, reqProcessor.ID, agReq.Request.String()))
-	case utils.MetaAuth:
+	case utils.MetaAuthorize:
 		authArgs := sessions.NewV1AuthorizeArgs(
 			reqProcessor.Flags.HasKey(utils.MetaAttributes),
 			reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),

diff --git a/agents/diamagent_test.go b/agents/diamagent_test.go
@@ -428,7 +428,7 @@ func TestProcessRequest(t *testing.T) {
 			return nil
 		},
 	}}
-	reqProcessor.Flags, _ = utils.FlagsWithParamsFromSlice([]string{utils.MetaAuth, utils.MetaAccounts})
+	reqProcessor.Flags, _ = utils.FlagsWithParamsFromSlice([]string{utils.MetaAuthorize, utils.MetaAccounts})
 	agReq := NewAgentRequest(diamDP, reqVars, cgrRplyNM, rply,
 		reqProcessor.Tenant, config.CgrConfig().GeneralCfg().DefaultTenant,
 		config.CgrConfig().GeneralCfg().DefaultTimezone, filters, nil, nil)

diff --git a/agents/dnsagent.go b/agents/dnsagent.go
@@ -179,7 +179,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
 	cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
 	var reqType string
 	for _, typ := range []string{
-		utils.MetaDryRun, utils.MetaAuth,
+		utils.MetaDryRun, utils.MetaAuthorize,
 		utils.MetaInitiate, utils.MetaUpdate,
 		utils.MetaTerminate, utils.MetaMessage,
 		utils.MetaCDRs, utils.MetaEvent, utils.META_NONE} {
@@ -189,7 +189,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
 		}
 	}
 	cgrArgs := cgrEv.ExtractArgs(reqProcessor.Flags.HasKey(utils.MetaDispatchers),
-		reqType == utils.MetaAuth || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
+		reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
 	if reqProcessor.Flags.HasKey(utils.MetaLog) {
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> LOG, processorID: <%s>, message: %s",
@@ -203,7 +203,7 @@ func (da *DNSAgent) processRequest(reqProcessor *config.RequestProcessor,
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> DRY_RUN, processorID: %s, CGREvent: %s",
 				utils.DNSAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
-	case utils.MetaAuth:
+	case utils.MetaAuthorize:
 		authArgs := sessions.NewV1AuthorizeArgs(
 			reqProcessor.Flags.HasKey(utils.MetaAttributes),
 			reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),

diff --git a/agents/httpagent.go b/agents/httpagent.go
@@ -115,7 +115,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
 	cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
 	var reqType string
 	for _, typ := range []string{
-		utils.MetaDryRun, utils.MetaAuth,
+		utils.MetaDryRun, utils.MetaAuthorize,
 		utils.MetaInitiate, utils.MetaUpdate,
 		utils.MetaTerminate, utils.MetaMessage,
 		utils.MetaCDRs, utils.MetaEvent, utils.MetaEmpty} {
@@ -125,7 +125,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
 		}
 	}
 	cgrArgs := cgrEv.ExtractArgs(reqProcessor.Flags.HasKey(utils.MetaDispatchers),
-		reqType == utils.MetaAuth || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
+		reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
 	if reqProcessor.Flags.HasKey(utils.MetaLog) {
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> LOG, processorID: %s, http message: %s",
@@ -139,7 +139,7 @@ func (ha *HTTPAgent) processRequest(reqProcessor *config.RequestProcessor,
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> DRY_RUN, processorID: %s, CGREvent: %s",
 				utils.HTTPAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
-	case utils.MetaAuth:
+	case utils.MetaAuthorize:
 		authArgs := sessions.NewV1AuthorizeArgs(
 			reqProcessor.Flags.HasKey(utils.MetaAttributes),
 			reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),

diff --git a/agents/radagent.go b/agents/radagent.go
@@ -31,7 +31,6 @@ import (
 const (
 	MetaRadReqType     = "*radReqType"
 	MetaRadAuth        = "*radAuth"
-	MetaRadAcctStart   = "*radAcctStart"
 	MetaRadReplyCode   = "*radReplyCode"
 	UserPasswordAVP    = "User-Password"
 	CHAPPasswordAVP    = "CHAP-Password"
@@ -174,7 +173,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
 	cgrEv := agReq.CGRRequest.AsCGREvent(agReq.Tenant, utils.NestingSep)
 	var reqType string
 	for _, typ := range []string{
-		utils.MetaDryRun, utils.MetaAuth,
+		utils.MetaDryRun, utils.MetaAuthorize,
 		utils.MetaInitiate, utils.MetaUpdate,
 		utils.MetaTerminate, utils.MetaMessage,
 		utils.MetaCDRs, utils.MetaEvent, utils.META_NONE, utils.MetaRadauth} {
@@ -184,7 +183,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
 		}
 	}
 	cgrArgs := cgrEv.ExtractArgs(reqProcessor.Flags.HasKey(utils.MetaDispatchers),
-		reqType == utils.MetaAuth || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
+		reqType == utils.MetaAuthorize || reqType == utils.MetaMessage || reqType == utils.MetaEvent)
 	if reqProcessor.Flags.HasKey(utils.MetaLog) {
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> LOG, processorID: %s, radius message: %s",
@@ -198,7 +197,7 @@ func (ra *RadiusAgent) processRequest(req *radigo.Packet, reqProcessor *config.R
 		utils.Logger.Info(
 			fmt.Sprintf("<%s> DRY_RUN, processorID: %s, CGREvent: %s",
 				utils.RadiusAgent, reqProcessor.ID, utils.ToJSON(cgrEv)))
-	case utils.MetaAuth:
+	case utils.MetaAuthorize:
 		authArgs := sessions.NewV1AuthorizeArgs(
 			reqProcessor.Flags.HasKey(utils.MetaAttributes),
 			reqProcessor.Flags.ParamsSlice(utils.MetaAttributes),

diff --git a/data/conf/samples/diam_tutmysql/voice.json b/data/conf/samples/diam_tutmysql/voice.json
@@ -9,7 +9,7 @@
 				"*string:~*req.CC-Request-Type:1",
 				"*string:~*req.Service-Context-Id:voice"
 			],
-			"flags": ["*auth", "*accounts"],
+			"flags": ["*authorize", "*accounts"],
 			"request_fields":[
 				{"tag": "ToR", "path": "*cgreq.ToR", "type": "*constant", "value": "*voice"},
 				{

diff --git a/data/conf/samples/dispatchers/radagent/authchallenge.json b/data/conf/samples/dispatchers/radagent/authchallenge.json
@@ -16,7 +16,7 @@
       {
         "id": "CGRAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:12345678"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/dispatchers/radagent/authchap.json b/data/conf/samples/dispatchers/radagent/authchap.json
@@ -5,7 +5,7 @@
       {
         "id": "CGRCHAPAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585362"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/dispatchers/radagent/authmschapv2.json b/data/conf/samples/dispatchers/radagent/authmschapv2.json
@@ -4,7 +4,7 @@
       {
         "id": "CGRMSCHAPV2PAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585363"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/dispatchers/radagent/authpapauth.json b/data/conf/samples/dispatchers/radagent/authpapauth.json
@@ -5,7 +5,7 @@
       {
         "id": "CGRPAPAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585361"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/dnsagent_internal/attributes.json b/data/conf/samples/dnsagent_internal/attributes.json
@@ -5,7 +5,7 @@
 		{
 			"id": "NAPTRAttributes",
 			"filters": ["*string:~*vars.QueryType:NAPTR", "*string:~*vars.E164Address:4986517174964"],
-			"flags": ["*auth", "*attributes","*log"],
+			"flags": ["*authorize", "*attributes","*log"],
 			"request_fields":[
 				{"tag": "E164Address", "path": "*cgreq.E164Address", 
 					"type": "*constant", "value": "4986517174964"},

diff --git a/data/conf/samples/dnsagent_mongo/attributes.json b/data/conf/samples/dnsagent_mongo/attributes.json
@@ -5,7 +5,7 @@
 		{
 			"id": "NAPTRAttributes",
 			"filters": ["*string:~*vars.QueryType:NAPTR", "*string:~*vars.E164Address:4986517174964"],
-			"flags": ["*auth", "*attributes","*log"],
+			"flags": ["*authorize", "*attributes","*log"],
 			"request_fields":[
 				{"tag": "E164Address", "path": "*cgreq.E164Address", 
 					"type": "*constant", "value": "4986517174964"},

diff --git a/data/conf/samples/dnsagent_mysql/attributes.json b/data/conf/samples/dnsagent_mysql/attributes.json
@@ -5,7 +5,7 @@
 		{
 			"id": "NAPTRAttributes",
 			"filters": ["*string:~*vars.QueryType:NAPTR", "*string:~*vars.E164Address:4986517174964"],
-			"flags": ["*auth", "*attributes","*log"],
+			"flags": ["*authorize", "*attributes","*log"],
 			"request_fields":[
 				{"tag": "E164Address", "path": "*cgreq.E164Address", 
 					"type": "*constant", "value": "4986517174964"},

diff --git a/data/conf/samples/httpagent_internal/httpagent.json b/data/conf/samples/httpagent_internal/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagent_internal_gob/httpagent.json b/data/conf/samples/httpagent_internal_gob/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagent_mongo/httpagent.json b/data/conf/samples/httpagent_mongo/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagent_mongo_gob/httpagent.json b/data/conf/samples/httpagent_mongo_gob/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagent_mysql/httpagent.json b/data/conf/samples/httpagent_mysql/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagent_mysql_gob/httpagent.json b/data/conf/samples/httpagent_mysql_gob/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagenttls_internal/httpagent.json b/data/conf/samples/httpagenttls_internal/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagenttls_internal_gob/httpagent.json b/data/conf/samples/httpagenttls_internal_gob/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagenttls_mongo/httpagent.json b/data/conf/samples/httpagenttls_mongo/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagenttls_mongo_gob/httpagent.json b/data/conf/samples/httpagenttls_mongo_gob/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagenttls_mysql/httpagent.json b/data/conf/samples/httpagenttls_mysql/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/httpagenttls_mysql_gob/httpagent.json b/data/conf/samples/httpagenttls_mysql_gob/httpagent.json
@@ -33,7 +33,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": [ "*auth", "*accounts", "*attributes"],
+				"flags": [ "*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
 					{"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/multifiles/a.json b/data/conf/samples/multifiles/a.json
@@ -49,7 +49,7 @@
 				"id": "OutboundAUTH",
 				"filters": ["*string:~*req.request_type:OutboundAUTH"],
 				"tenant": "cgrates.org",
-				"flags": ["*auth", "*accounts", "*attributes"],
+				"flags": ["*authorize", "*accounts", "*attributes"],
 				"request_fields":[
 					{"tag": "RequestType", "path": "RequestType", "type": "*constant", 
 						"value": "*pseudoprepaid", "mandatory": true},	

diff --git a/data/conf/samples/radagent_internal/authchallenge.json b/data/conf/samples/radagent_internal/authchallenge.json
@@ -16,7 +16,7 @@
       {
         "id": "CGRAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:12345678"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal/authchap.json b/data/conf/samples/radagent_internal/authchap.json
@@ -5,7 +5,7 @@
       {
         "id": "CGRCHAPAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585362"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal/authmschapv2.json b/data/conf/samples/radagent_internal/authmschapv2.json
@@ -4,7 +4,7 @@
       {
         "id": "CGRMSCHAPV2PAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585363"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal/authpapauth.json b/data/conf/samples/radagent_internal/authpapauth.json
@@ -5,7 +5,7 @@
       {
         "id": "CGRPAPAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585361"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal_gob/authchallenge.json b/data/conf/samples/radagent_internal_gob/authchallenge.json
@@ -16,7 +16,7 @@
       {
         "id": "CGRAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:12345678"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal_gob/authchap.json b/data/conf/samples/radagent_internal_gob/authchap.json
@@ -5,7 +5,7 @@
       {
         "id": "CGRCHAPAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585362"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal_gob/authmschapv2.json b/data/conf/samples/radagent_internal_gob/authmschapv2.json
@@ -4,7 +4,7 @@
       {
         "id": "CGRMSCHAPV2PAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585363"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_internal_gob/authpapauth.json b/data/conf/samples/radagent_internal_gob/authpapauth.json
@@ -5,7 +5,7 @@
       {
         "id": "CGRPAPAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:51585361"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",

diff --git a/data/conf/samples/radagent_mongo/authchallenge.json b/data/conf/samples/radagent_mongo/authchallenge.json
@@ -16,7 +16,7 @@
       {
         "id": "CGRAuth",
         "filters": ["*string:~*vars.*radReqType:*radAuth", "*string:~*req.Sip-From-Tag:12345678"],
-        "flags": ["*auth", "*attributes", "*accounts", "*continue"],
+        "flags": ["*authorize", "*attributes", "*accounts", "*continue"],
         "request_fields":[
           {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"},
           {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant",