Merge remote-tracking branch 'origin/master' into rustedbuilds

endpoints/index.py

@@ -120,6 +120,11 @@ def get_user():
       'username': get_authenticated_user().username,
       'email': get_authenticated_user().email,
     })
+  elif get_validated_token():
+    return jsonify({
+      'username': '$token',
+      'email': None,
+    })
   abort(404)