chore(auth-server): minor code cleanup and fixes#19940

sreecharan-desu wants to merge 2 commits intomozilla:mainmozilla/fxa:mainfrom

sreecharan-desu:fix/auth-server-cleanupssreecharan-desu/mozilla-fxa:fix/auth-server-cleanupsCopy head branch name to clipboard