Trusted application replacement

Would 2legged oauth with impersonation be the proper replacement now that trusted apps are deprecated? Also, will basic auth still be available for non-atlassian integrations going forward?