removing id token dependency

Author: ashishkurmi

apiclient.go

@@ -33,20 +33,21 @@ func (apiclient *ApiClient) performRequest(method, url string, headers map[strin
 		return nil, err
 	}
 
-	for k, v := range headers {
-		req.Header.Add(k, v)
+	if headers != nil {
+		for key, value := range headers {
+			req.Header.Add(key, value)
+		}
 	}
 
 	return apiclient.Client.Do(req)
 }
 
-func (apiclient *ApiClient) SubmitCodeReviewRequest(oidcToken string, prDetails *PullRequestDetails) (*CodeReviewRequestResponse, error) {
+func (apiclient *ApiClient) SubmitCodeReviewRequest(prDetails *PullRequestDetails) (*CodeReviewRequestResponse, error) {
 	url := fmt.Sprintf("%s/codereview/submit", apiclient.ApiBaseURI)
 	jsonData, _ := json.Marshal(prDetails)
 
 	headers := map[string]string{
-		"Content-Type":  "application/json; charset=UTF-8",
-		"Authorization": fmt.Sprintf("Bearer %s", oidcToken),
+		"Content-Type": "application/json; charset=UTF-8",
 	}
 
 	resp, err := apiclient.performRequest("POST", url, headers, bytes.NewBuffer(jsonData))
@@ -69,14 +70,10 @@ func (apiclient *ApiClient) SubmitCodeReviewRequest(oidcToken string, prDetails
 	return &codeReviewRequestResponse, nil
 }
 
-func (apiclient *ApiClient) GetCodeReviewComments(oidcToken string, request *CodeReviewRequestResponse) (*CodeReviewCommentsResponse, error) {
+func (apiclient *ApiClient) GetCodeReviewComments(request *CodeReviewRequestResponse) (*CodeReviewCommentsResponse, error) {
 	url := fmt.Sprintf("%s/codereview/comments?fullreponame=%s&codereviewid=%s", apiclient.ApiBaseURI, request.FullRepoName, request.CodeReviewID)
 
-	headers := map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", oidcToken),
-	}
-
-	resp, err := apiclient.performRequest("GET", url, headers, nil)
+	resp, err := apiclient.performRequest("GET", url, nil, nil)
 	if err != nil {
 		return nil, err
 	}

main.go

@@ -40,15 +40,6 @@ const (
 	OperationStatusError      = "Error"
 )
 
-func getTokenRemainingValidity(timestamp interface{}) float64 {
-	if validity, ok := timestamp.(float64); ok {
-		tm := time.Unix(int64(validity), 0)
-		remainder := time.Until(tm)
-		return remainder.Seconds()
-	}
-	return 0
-}
-
 func getGitHubClient() (*github.Client, context.Context, error) {
 	pat := os.Getenv("INPUT_PAT")
 	if len(pat) == 0 {
@@ -159,22 +150,12 @@ func getPullRequestDetailsFromEnvironment(isDebugMode bool) (*PullRequestDetails
 
 func submitPRDetailsAndGetCodeFeedback(prDetails *PullRequestDetails, isDebugMode bool) (bool, error) {
 	responseReceived := false
-	audience := APIEndpoint
-	oidcClient, err := DefaultOIDCClient(audience)
-	if err != nil {
-		return responseReceived, fmt.Errorf("error generating OIDC auth token. error:%v", err)
-	}
-
-	actionsJWT, exp, err := getActionsJWTAndExp(oidcClient, isDebugMode)
-	if err != nil {
-		return responseReceived, fmt.Errorf("error generating OIDC auth token. error:%v", err)
-	}
 
 	apiClient := ApiClient{
 		Client:     &http.Client{},
 		ApiBaseURI: APIEndpoint + "/v1/app/",
 	}
-	response, err := apiClient.SubmitCodeReviewRequest(actionsJWT.Value, prDetails)
+	response, err := apiClient.SubmitCodeReviewRequest(prDetails)
 	if err != nil {
 		return responseReceived, fmt.Errorf("error submitting code review request: %v", err)
 	}
@@ -185,15 +166,7 @@ func submitPRDetailsAndGetCodeFeedback(prDetails *PullRequestDetails, isDebugMod
 	var reviewComments *CodeReviewCommentsResponse
 
 	for i := 0; i < 20 && !responseReceived; i++ {
-		remainder := getTokenRemainingValidity(exp)
-		if remainder < 60 {
-			githubactions.Infof("Renewing OIDC token as it's only valid for %f", remainder)
-			actionsJWT, exp, err = getActionsJWTAndExp(oidcClient, isDebugMode)
-			if err != nil {
-				return responseReceived, fmt.Errorf("error renewing OIDC token. Error: %v", err)
-			}
-		}
-		reviewComments, err = apiClient.GetCodeReviewComments(actionsJWT.Value, response)
+		reviewComments, err = apiClient.GetCodeReviewComments(response)
 		if err != nil {
 			return responseReceived, fmt.Errorf("error retrieving code review comments: %v", err)
 		}