merged login and authenticate to angular