[MOB-9954]: Fix Circular Dependency and Clean Up Auth Checks on API Calls

[MOB-9954]: Fix Circular Dependency and Clean Up Auth Checks on API Calls #1237