Replace auth check with the proper method