Using the current session (logout) flow is apperently against Shopify TOS

Currently, when a store logs out of the app, in an embedded app, the store url is infered from the referer url, and the user is redirect to the login screen with the store url (of the logged out store) already prefilled.

On a non-embedded app, the user is redirected to the login screen where they have to re-enter the store url:

https://github.com/Shopify/shopify_app/blob/c78bebeae923c0bc699d318620d92301c7666978/app/views/shopify_app/sessions/new.html.erb#L30

I just got an email from the Shopify app review team, saying my app will be delisted if it stays like this.

They are linking to this document: https://shopify.dev/docs/apps/launch/app-requirements-checklist#c-setup-and-merchant-workflows

Which says:

Apps must be installed and initiated only on Shopify services. Your app must not request the manual entry of a myshopify.com URL or a shop's domain during the installation or configuration flow.

Is that even possible on non-embedded apps?

Start with app/views/shopify_app/sessions/new.html.erb and trace the current embedded and non-embedded logout/session flow. Determine whether the non-embedded flow can comply with the linked Shopify requirement without manual store URL entry; done means the affected login path no longer requests that entry and the existing redirect behavior is understood.