Get the flask-security token from /api/me. Fixes an issue in the UI t…

…hat broke 2FA.

opentakserver/blueprints/api.py

@@ -301,8 +301,8 @@ def certificate():
 @api_blueprint.route('/api/me')
 @auth_required()
 def me():
-    me = db.session.execute(db.session.query(User).where(User.id == current_user.id)).first()[0]
-    return jsonify(me.serialize())
+    # me = db.session.execute(db.session.query(User).where(User.id == current_user.id)).first()[0]
+    return jsonify(current_user.to_json())
 
 
 @api_blueprint.route('/api/cot', methods=['GET'])

opentakserver/models/user.py

@@ -30,4 +30,6 @@ def serialize(self):
         }
 
     def to_json(self):
-        return self.serialize()
+        response = self.serialize()
+        response['token'] = self.get_auth_token()
+        return response