Refactor: refactor after openapi refactor

free5gc · Nov 9, 2023 · 374087e · 374087e
1 parent 5ea410d
commit 374087e
Show file tree

Hide file tree

Showing 7 changed files with 178 additions and 106 deletions.
diff --git a/internal/sbi/consumer/nf_accesstoken.go b/internal/sbi/consumer/nf_accesstoken.go
@@ -3,19 +3,17 @@ package consumer
 import (
 	"context"
 
-	udm_context "github.com/free5gc/udm/internal/context"
-
-	"github.com/free5gc/udm/pkg/factory"
-
 	"github.com/free5gc/openapi"
-	"github.com/free5gc/openapi/Send_util"
 	"github.com/free5gc/openapi/models"
+	"github.com/free5gc/openapi/oauth"
+	udm_context "github.com/free5gc/udm/internal/context"
+	"github.com/free5gc/udm/pkg/factory"
 )
 
 func GetTokenCtx(scope, targetNF string) (context.Context, *models.ProblemDetails, error) {
 	if factory.UdmConfig.GetOAuth() {
 		udmSelf := udm_context.Getself()
-		tok, pd, err := Send_util.SendAccTokenReq(udmSelf.NfId, models.NfType_UDM, scope, targetNF, udmSelf.NrfUri)
+		tok, pd, err := oauth.SendAccTokenReq(udmSelf.NfId, models.NfType_UDM, scope, targetNF, udmSelf.NrfUri)
 		if err != nil {
 			return nil, pd, err
 		}

diff --git a/internal/sbi/producer/generate_auth_data.go b/internal/sbi/producer/generate_auth_data.go
@@ -1,7 +1,6 @@
 package producer
 
 import (
-	"context"
 	cryptoRand "crypto/rand"
 	"encoding/hex"
 	"fmt"
@@ -20,6 +19,7 @@ import (
 	"github.com/free5gc/openapi/models"
 	udm_context "github.com/free5gc/udm/internal/context"
 	"github.com/free5gc/udm/internal/logger"
+	udm_consumer "github.com/free5gc/udm/internal/sbi/consumer"
 	"github.com/free5gc/udm/pkg/suci"
 	"github.com/free5gc/util/httpwrapper"
 	"github.com/free5gc/util/milenage"
@@ -127,9 +127,12 @@ func ConfirmAuthDataProcedure(authEvent models.AuthEvent, supi string) (problemD
 	if err != nil {
 		return openapi.ProblemDetailsSystemFailure(err.Error())
 	}
-	// TODO: [OAUTH2] should call GetTokenCtx("nudr-dr", "UDR")
+	ctx, pd, err := udm_consumer.GetTokenCtx("nudr-dr", "UDR")
+	if err != nil {
+		return pd
+	}
 	resp, err := client.AuthenticationStatusDocumentApi.CreateAuthenticationStatus(
-		context.Background(), supi, &createAuthParam)
+		ctx, supi, &createAuthParam)
 	if err != nil {
 		problemDetails = &models.ProblemDetails{
 			Status: int32(resp.StatusCode),
@@ -174,8 +177,11 @@ func GenerateAuthDataProcedure(authInfoRequest models.AuthenticationInfoRequest,
 	if err != nil {
 		return nil, openapi.ProblemDetailsSystemFailure(err.Error())
 	}
-	// TODO: [OAUTH2] should call GetTokenCtx("nudr-dr", "UDR")
-	authSubs, res, err := client.AuthenticationDataDocumentApi.QueryAuthSubsData(context.Background(), supi, nil)
+	ctx, pd, err := udm_consumer.GetTokenCtx("nudr-dr", "UDR")
+	if err != nil {
+		return nil, pd
+	}
+	authSubs, res, err := client.AuthenticationDataDocumentApi.QueryAuthSubsData(ctx, supi, nil)
 	if err != nil {
 		problemDetails = &models.ProblemDetails{
 			Status: http.StatusForbidden,
@@ -463,9 +469,12 @@ func GenerateAuthDataProcedure(authInfoRequest models.AuthenticationInfoRequest,
 	}
 
 	var rsp *http.Response
-	// TODO: [OAUTH2] should call GetTokenCtx("nudr-dr", "UDR")
+	ctx, pd, err = udm_consumer.GetTokenCtx("nudr-dr", "UDR")
+	if err != nil {
+		return nil, pd
+	}
 	rsp, err = client.AuthenticationDataDocumentApi.ModifyAuthentication(
-		context.Background(), supi, patchItemArray)
+		ctx, supi, patchItemArray)
 	if err != nil {
 		problemDetails = &models.ProblemDetails{
 			Status: http.StatusForbidden,

diff --git a/internal/sbi/producer/parameter_provision.go b/internal/sbi/producer/parameter_provision.go
@@ -1,12 +1,12 @@
 package producer
 
 import (
-	"context"
 	"net/http"
 
 	"github.com/free5gc/openapi"
 	"github.com/free5gc/openapi/models"
 	"github.com/free5gc/udm/internal/logger"
+	udm_consumer "github.com/free5gc/udm/internal/sbi/consumer"
 	"github.com/free5gc/util/httpwrapper"
 )
 
@@ -34,8 +34,11 @@ func UpdateProcedure(updateRequest models.PpData, gpsi string) (problemDetails *
 	if err != nil {
 		return openapi.ProblemDetailsSystemFailure(err.Error())
 	}
-	// TODO: [OAUTH2] should call GetTokenCtx("nudr-dr", "UDR")
-	res, err := clientAPI.ProvisionedParameterDataDocumentApi.ModifyPpData(context.Background(), gpsi, nil)
+	ctx, pd, err := udm_consumer.GetTokenCtx("nudr-dr", "UDR")
+	if err != nil {
+		return pd
+	}
+	res, err := clientAPI.ProvisionedParameterDataDocumentApi.ModifyPpData(ctx, gpsi, nil)
 	if err != nil {
 		problemDetails = &models.ProblemDetails{
 			Status: int32(res.StatusCode),