fix(common): Use clientToken before using TokenA when building authorize header

fix(common): Use clientToken before using TokenA when building authorize header #186