Use project's redirect url instead of composing url (#33058)

Use project's redirect url instead of composing url (#33058) #25207