Making sure that we have refresh token when user logs in.

critiquebrainz/frontend/login/provider.py

@@ -93,16 +93,19 @@ def _get_auth_session():
     }, decoder=json.loads)
 
 
-def get_authentication_uri():
+def get_authentication_uri(approval_prompt='auto'):
     """Prepare and return uri to authentication service login form.
-    All passed parameters should be included in a callback uri,
-    to which user will be redirected after a successful authentication.
+
+    Args:
+        approval_prompt: Either 'auto' or 'force'. Second forces approval form
+            display. Default is 'auto'.
     """
     csrf = generate_string(20)
     _persist_data(csrf=csrf)
     params = {
         'response_type': 'code',
         'redirect_uri': url_for('login.musicbrainz_post', _external=True),
+        'approval_prompt': approval_prompt,
         'access_type': 'offline',
         'scope': 'profile rating',
         'state': csrf,

critiquebrainz/frontend/login/views.py

@@ -16,15 +16,20 @@ def index():
 @login_forbidden
 def musicbrainz():
     session['next'] = request.args.get('next')
-    return redirect(provider.get_authentication_uri())
+    force_prompt = 'force' if request.args.get('force') else 'auto'
+    return redirect(provider.get_authentication_uri(force_prompt))
 
 
 @login_bp.route('/musicbrainz/post')
 @login_forbidden
 def musicbrainz_post():
     """Callback endpoint."""
     if provider.validate_post_login():
-        login_user(provider.get_user())
+        user = provider.get_user()
+        if not user.mb_refresh_token:
+            # Making sure that we have refresh token for this user
+            return redirect(url_for('.musicbrainz', force=True))
+        login_user(user)
         next = session.get('next')
         if next:
             return redirect(next)