uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

sessions: get originID from APIOpts instead of event

Browse Source
This commit is contained in:
ionutboangiu
2025-07-09 00:40:30 +03:00
committed by Dan Christian Bogos
parent 54f4a63c24
commit 97969bb707
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sessions/apis.go
View File

@@ -137,7 +137,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context,
if len(sS.cfg.SessionSCfg().ResourceSConns) == 0 {
return utils.NewErrNotConnected(utils.ResourceS)
}
originID, _ := args.FieldAsString(utils.OriginID)
originID, _ := args.OptAsString(utils.MetaOriginID)
if originID == "" {
originID = utils.UUIDSha1Prefix()
}
@@ -154,7 +154,7 @@ func (sS *SessionS) BiRPCv1AuthorizeEvent(ctx *context.Context,
if len(sS.cfg.SessionSCfg().IPsConns) == 0 {
return utils.NewErrNotConnected(utils.IPs)
}
originID, _ := args.FieldAsString(utils.OriginID)
originID, _ := args.OptAsString(utils.MetaOriginID)
if originID == "" {
originID = utils.UUIDSha1Prefix()
}
@@ -284,20 +284,17 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context,
}
// end of RPC caching
var originID string
dP := args.AsDataProvider()
if originID, err = engine.GetStringOpts(ctx, args.Tenant, dP, nil, sS.fltrS, nil,
utils.MetaOriginID); err != nil {
return
} else if originID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.OriginID)
originID, err := args.OptAsString(utils.MetaOriginID)
if err != nil {
return err
}
if _, has := args.APIOpts[utils.MetaOriginID]; !has {
args.APIOpts[utils.MetaOriginID] = originID
if originID == "" {
return utils.NewErrMandatoryIeMissing(utils.OriginID)
}
rply.MaxUsage = utils.DurationPointer(time.Duration(utils.InvalidUsage)) // temp
dP := args.AsDataProvider()
var acntS bool
if acntS, err = engine.GetBoolOpts(ctx, args.Tenant, dP, nil, sS.fltrS, sS.cfg.SessionSCfg().Opts.MaxUsage,
utils.MetaAccounts); err != nil {
@@ -358,9 +355,6 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context,
if len(sS.cfg.SessionSCfg().ResourceSConns) == 0 {
return utils.NewErrNotConnected(utils.ResourceS)
}
if originID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.OriginID)
}
args.APIOpts[utils.OptsResourcesUsageID] = originID
args.APIOpts[utils.OptsResourcesUnits] = 1
var allocMessage string
@@ -386,9 +380,6 @@ func (sS *SessionS) BiRPCv1InitiateSession(ctx *context.Context,
if len(sS.cfg.SessionSCfg().IPsConns) == 0 {
return utils.NewErrNotConnected(utils.IPs)
}
if originID == utils.EmptyString {
return utils.NewErrMandatoryIeMissing(utils.OriginID)
}
args.APIOpts[utils.OptsIPsAllocationID] = originID
var allocIP utils.AllocatedIP
if err = sS.connMgr.Call(ctx, sS.cfg.SessionSCfg().IPsConns,