diff --git a/apier/v1/sessions.go b/apier/v1/sessions.go index cc6a48707..8ca9c1984 100644 --- a/apier/v1/sessions.go +++ b/apier/v1/sessions.go @@ -157,7 +157,7 @@ func (ssv1 *SessionSv1) STIRAuthenticate(args *sessions.V1STIRAuthenticateArgs, return ssv1.Ss.BiRPCv1STIRAuthenticate(nil, args, reply) } -// STIRInitiate creates the identity for STIR/SHAKEN -func (ssv1 *SessionSv1) STIRInitiate(args *sessions.V1STIRInitiateArgs, reply *string) error { - return ssv1.Ss.BiRPCv1STIRInitiate(nil, args, reply) +// STIRIdentity creates the identity for STIR/SHAKEN +func (ssv1 *SessionSv1) STIRIdentity(args *sessions.V1STIRIdentityArgs, reply *string) error { + return ssv1.Ss.BiRPCv1STIRIdentity(nil, args, reply) } diff --git a/apier/v1/sessionsbirpc.go b/apier/v1/sessionsbirpc.go index eff84a5de..4ab290d34 100644 --- a/apier/v1/sessionsbirpc.go +++ b/apier/v1/sessionsbirpc.go @@ -57,7 +57,7 @@ func (ssv1 *SessionSv1) Handlers() map[string]interface{} { utils.SessionSv1DisconnectPeer: ssv1.BiRPCV1DisconnectPeer, utils.SessionSv1STIRAuthenticate: ssv1.BiRPCV1STIRAuthenticate, - utils.SessionSv1STIRInitiate: ssv1.BiRPCV1STIRInitiate, + utils.SessionSv1STIRIdentity: ssv1.BiRPCV1STIRIdentity, } } @@ -187,8 +187,8 @@ func (ssv1 *SessionSv1) BiRPCV1STIRAuthenticate(clnt *rpc2.Client, return ssv1.Ss.BiRPCv1STIRAuthenticate(clnt, args, reply) } -// BiRPCV1STIRInitiate creates the identity for STIR/SHAKEN -func (ssv1 *SessionSv1) BiRPCV1STIRInitiate(clnt *rpc2.Client, - args *sessions.V1STIRInitiateArgs, reply *string) error { - return ssv1.Ss.BiRPCv1STIRInitiate(nil, args, reply) +// BiRPCV1STIRIdentity creates the identity for STIR/SHAKEN +func (ssv1 *SessionSv1) BiRPCV1STIRIdentity(clnt *rpc2.Client, + args *sessions.V1STIRIdentityArgs, reply *string) error { + return ssv1.Ss.BiRPCv1STIRIdentity(nil, args, reply) } diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index e64bf14de..7647aed99 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -50,7 +50,7 @@ var ( testSes2StirAuthenticate, testSes2StirInit, testSes2STIRAuthenticate, - testSes2STIRInitiate, + testSes2STIRIdentity, testSes2ItStopCgrEngine, } ) @@ -267,21 +267,21 @@ func testSes2STIRAuthenticate(t *testing.T) { } } -func testSes2STIRInitiate(t *testing.T) { +func testSes2STIRIdentity(t *testing.T) { payload := &utils.PASSporTPayload{ Dest: utils.PASSporTDestinationsIdentity{Tn: []string{"1002"}}, IAT: 1587019822, Orig: utils.PASSporTOriginsIdentity{Tn: "1001"}, OrigID: "123456", } - args := &sessions.V1STIRInitiateArgs{ + args := &sessions.V1STIRIdentityArgs{ Payload: payload, PublicKeyPath: "/usr/share/cgrates/stir/stir_pubkey.pem", PrivateKeyPath: "/usr/share/cgrates/stir/stir_privatekey.pem", OverwriteIAT: true, } var rply string - if err := ses2RPC.Call(utils.SessionSv1STIRInitiate, + if err := ses2RPC.Call(utils.SessionSv1STIRIdentity, args, &rply); err != nil { t.Error(err) } diff --git a/sessions/libsessions.go b/sessions/libsessions.go index 286c961d9..10e4571c6 100644 --- a/sessions/libsessions.go +++ b/sessions/libsessions.go @@ -282,8 +282,8 @@ type V1STIRAuthenticateArgs struct { PayloadMaxDuration string // the duration the payload is valid after it's creation } -// V1STIRInitiateArgs are the arguments for STIRInitiate API -type V1STIRInitiateArgs struct { +// V1STIRIdentityArgs are the arguments for STIRIdentity API +type V1STIRIdentityArgs struct { Payload *utils.PASSporTPayload // the STIR payload PublicKeyPath string // the path to the public key used in the header PrivateKeyPath string // the private key path diff --git a/sessions/sessions.go b/sessions/sessions.go index 644b27643..b23e3ad0a 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -3830,9 +3830,9 @@ func (sS *SessionS) BiRPCv1STIRAuthenticate(clnt rpcclient.ClientConnector, return } -// BiRPCv1STIRInitiate the API for STIR header creation -func (sS *SessionS) BiRPCv1STIRInitiate(clnt rpcclient.ClientConnector, - args *V1STIRInitiateArgs, identity *string) (err error) { +// BiRPCv1STIRIdentity the API for STIR header creation +func (sS *SessionS) BiRPCv1STIRIdentity(clnt rpcclient.ClientConnector, + args *V1STIRIdentityArgs, identity *string) (err error) { if args.Payload.ATTest == utils.EmptyString { args.Payload.ATTest = sS.cgrCfg.SessionSCfg().STIRCfg.DefaultAttest } diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index f2e79a65a..ba21ba23a 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -2276,7 +2276,7 @@ aa+jqv4dwkr/FLEcN1zC76Y/IniI65fId55hVJvN3ORuzUqYEtzD3irmsw== } } -func TestBiRPCv1STIRInitiate(t *testing.T) { +func TestBiRPCv1STIRIdentity(t *testing.T) { sS := new(SessionS) sS.cgrCfg = config.CgrConfig() payload := &utils.PASSporTPayload{ @@ -2311,7 +2311,7 @@ aa+jqv4dwkr/FLEcN1zC76Y/IniI65fId55hVJvN3ORuzUqYEtzD3irmsw== nil, true, utils.NonTransactional) var rcv string - if err := sS.BiRPCv1STIRInitiate(nil, &V1STIRInitiateArgs{ + if err := sS.BiRPCv1STIRIdentity(nil, &V1STIRIdentityArgs{ Payload: payload, PublicKeyPath: "https://www.example.org/cert.cer", PrivateKeyPath: "https://www.example.org/private.pem", @@ -2321,7 +2321,7 @@ aa+jqv4dwkr/FLEcN1zC76Y/IniI65fId55hVJvN3ORuzUqYEtzD3irmsw== } engine.Cache.Set(utils.CacheSTIR, "https://www.example.org/private.pem", prvKey, nil, true, utils.NonTransactional) - if err := sS.BiRPCv1STIRInitiate(nil, &V1STIRInitiateArgs{ + if err := sS.BiRPCv1STIRIdentity(nil, &V1STIRIdentityArgs{ Payload: payload, PublicKeyPath: "https://www.example.org/cert.cer", PrivateKeyPath: "https://www.example.org/private.pem", diff --git a/utils/consts.go b/utils/consts.go index 882c1e959..162acf5b1 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -1374,7 +1374,7 @@ const ( SessionSv1DisconnectPeer = "SessionSv1.DisconnectPeer" SessionSv1DisconnectWarning = "SessionSv1.DisconnectWarning" SessionSv1STIRAuthenticate = "SessionSv1.STIRAuthenticate" - SessionSv1STIRInitiate = "SessionSv1.STIRInitiate" + SessionSv1STIRIdentity = "SessionSv1.STIRIdentity" ) // Responder APIs