Removed some unnecessary boiler plate for some function

Author: 4gust

apps/internal/oauth/ops/accesstokens/accesstokens.go

@@ -282,9 +282,7 @@ func (c Client) FromClientSecret(ctx context.Context, authParameters authority.A
 	addScopeQueryParam(qv, authParameters)
 
 	// Add extra body parameters if provided
-	if err := addExtraBodyParameters(ctx, qv, authParameters); err != nil {
-		return TokenResponse{}, err
-	}
+	addExtraBodyParameters(ctx, qv, authParameters)
 
 	return c.doTokenResp(ctx, authParameters, qv)
 }
@@ -302,9 +300,7 @@ func (c Client) FromAssertion(ctx context.Context, authParameters authority.Auth
 	addScopeQueryParam(qv, authParameters)
 
 	// Add extra body parameters if provided
-	if err := addExtraBodyParameters(ctx, qv, authParameters); err != nil {
-		return TokenResponse{}, err
-	}
+	addExtraBodyParameters(ctx, qv, authParameters)
 
 	return c.doTokenResp(ctx, authParameters, qv)
 }
@@ -340,10 +336,7 @@ func (c Client) FromUserAssertionClientCertificate(ctx context.Context, authPara
 	addScopeQueryParam(qv, authParameters)
 
 	// Add extra body parameters if provided
-	if err := addExtraBodyParameters(ctx, qv, authParameters); err != nil {
-		return TokenResponse{}, err
-	}
-
+	addExtraBodyParameters(ctx, qv, authParameters)
 	return c.doTokenResp(ctx, authParameters, qv)
 }
 
@@ -483,15 +476,10 @@ func addScopeQueryParam(queryParams url.Values, authParameters authority.AuthPar
 }
 
 // addExtraBodyParameters evaluates and adds extra body parameters to the request
-func addExtraBodyParameters(ctx context.Context, v url.Values, ap authority.AuthParams) error {
-	if len(ap.ExtraBodyParameters) == 0 {
-		return nil
-	}
-
+func addExtraBodyParameters(ctx context.Context, v url.Values, ap authority.AuthParams) {
 	for key, value := range ap.ExtraBodyParameters {
 		if value != "" {
 			v.Set(key, value)
 		}
 	}
-	return nil
 }

apps/internal/oauth/ops/accesstokens/extrabodyparams_test.go

@@ -92,10 +92,7 @@ func TestAddExtraBodyParameters(t *testing.T) {
 			ap := authority.AuthParams{
 				ExtraBodyParameters: tt.params,
 			}
-			err := addExtraBodyParameters(ctx, v, ap)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
+			addExtraBodyParameters(ctx, v, ap)
 			if tt.validate != nil {
 				tt.validate(t, v)
 			}
@@ -116,10 +113,7 @@ func TestAddExtraBodyParametersDoesNotOverwrite(t *testing.T) {
 		ExtraBodyParameters: params,
 	}
 
-	err := addExtraBodyParameters(context.Background(), v, ap)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
+	addExtraBodyParameters(context.Background(), v, ap)
 
 	// Check that existing parameter is still there
 	if v.Get("existing_param") != "existing_value" {

apps/internal/oauth/ops/authority/authority.go

@@ -649,20 +649,17 @@ func (a *AuthParams) AssertionHash() string {
 }
 
 func (a *AuthParams) AppKey() string {
-	baseKey := ""
+	baseKey := a.ClientID + "_"
 	if a.AuthorityInfo.Tenant != "" {
-		baseKey = fmt.Sprintf("%s_%s", a.ClientID, a.AuthorityInfo.Tenant)
-	} else {
-		baseKey = fmt.Sprintf("%s_", a.ClientID)
+		baseKey += a.AuthorityInfo.Tenant
 	}
 
 	// Include extra body parameters in the cache key
-	if len(a.CacheKeyComponents) > 0 {
-		paramHash := a.CacheExtKeyGenerator()
-		if paramHash != "" {
-			baseKey = fmt.Sprintf("%s_%s", baseKey, paramHash)
-		}
+	paramHash := a.CacheExtKeyGenerator()
+	if paramHash != "" {
+		baseKey = fmt.Sprintf("%s_%s", baseKey, paramHash)
 	}
+
 	return baseKey + "_AppTokenCache"
 }