@@ -500,7 +500,7 @@ else if(emailHash != null) {
500500 responseStatus = TokenResponseStatsCollector .ResponseStatus .OptOut ;
501501 }
502502 else { //user not opted out and already generated valid identity token
503- response = ResponseUtil .SuccessV2 (toJsonV1 (identityTokens ));
503+ response = ResponseUtil .SuccessV2 (toTokenResponseJson (identityTokens ));
504504 }
505505 //if returning an optout token or a successful identity token created originally
506506 if (responseStatus == TokenResponseStatsCollector .ResponseStatus .Success ) {
@@ -839,7 +839,7 @@ private void handleTokenRefreshV2(RoutingContext rc) {
839839 ResponseUtil .LogErrorAndSendResponse (ResponseStatus .UnknownError , 500 , rc , "Unknown State" );
840840 }
841841 } else {
842- ResponseUtil .SuccessV2 (rc , toJsonV1 (r .getTokens ()));
842+ ResponseUtil .SuccessV2 (rc , toTokenResponseJson (r .getTokens ()));
843843 this .recordRefreshDurationStats (siteId , getApiContact (rc ), r .getDurationSinceLastRefresh (), rc .request ().headers ().contains (ORIGIN_HEADER ), identityExpiresAfter );
844844 }
845845 TokenResponseStatsCollector .recordRefresh (siteProvider , siteId , TokenResponseStatsCollector .Endpoint .RefreshV2 , r , platformType );
@@ -952,14 +952,14 @@ private void handleTokenGenerateV2(RoutingContext rc) {
952952 refreshExpiresAfter ,
953953 identityExpiresAfter );
954954
955- ResponseUtil .SuccessV2 (rc , toJsonV1 (optOutTokens ));
955+ ResponseUtil .SuccessV2 (rc , toTokenResponseJson (optOutTokens ));
956956 recordTokenResponseStats (siteId , TokenResponseStatsCollector .Endpoint .GenerateV2 , TokenResponseStatsCollector .ResponseStatus .Success , siteProvider , optOutTokens .getAdvertisingTokenVersion (), platformType );
957957 } else { // new participant, or legacy specified policy/optout_check=1
958958 ResponseUtil .SuccessNoBodyV2 ("optout" , rc );
959959 recordTokenResponseStats (siteId , TokenResponseStatsCollector .Endpoint .GenerateV2 , TokenResponseStatsCollector .ResponseStatus .OptOut , siteProvider , null , platformType );
960960 }
961961 } else {
962- ResponseUtil .SuccessV2 (rc , toJsonV1 (t ));
962+ ResponseUtil .SuccessV2 (rc , toTokenResponseJson (t ));
963963 recordTokenResponseStats (siteId , TokenResponseStatsCollector .Endpoint .GenerateV2 , TokenResponseStatsCollector .ResponseStatus .Success , siteProvider , t .getAdvertisingTokenVersion (), platformType );
964964 }
965965 }
@@ -1659,7 +1659,7 @@ private TransparentConsentParseResult getUserConsentV2(JsonObject req) {
16591659 }
16601660 }
16611661
1662- private JsonObject toJsonV1 (IdentityTokens t ) {
1662+ private JsonObject toTokenResponseJson (IdentityTokens t ) {
16631663 final JsonObject json = new JsonObject ();
16641664 json .put ("advertising_token" , t .getAdvertisingToken ());
16651665 json .put ("refresh_token" , t .getRefreshToken ());
0 commit comments