Miscellaneous II

client/src/api/index.js

@@ -103,7 +103,7 @@ export function me(config) {
     if (config.local && 1 == 1) {
         let sub = "urn:service_admin";
         sub = "urn:john";
-        //sub = "urn:paul";
+        sub = "urn:paul";
         const second_factor_confirmed = true;
         // const second_factor_confirmed = false;
         // sub = "urn:unknown";

server/api/invitation.py

@@ -129,15 +129,15 @@ def invitations_by_hash():
     for member in invitation.collaboration.collaboration_memberships:
         member.user
 
-    if not query_param("expand", required=False):
-        return invitation, 200
-
     invitation_json = jsonify(invitation).json
     # Sanitize user information
     for cm in invitation_json["collaboration"]["collaboration_memberships"]:
         cm["user"] = User.sanitize_user(cm["user"])
     invitation_json["user"] = User.sanitize_user(invitation_json["user"])
 
+    if not query_param("expand", required=False):
+        return invitation_json, 200
+
     service_emails = invitation.collaboration.service_emails()
     admin_emails = invitation.collaboration.organisation.admin_emails()
     return {"invitation": invitation_json, "service_emails": service_emails, "admin_emails": admin_emails}, 200