Small pytest fix

Author: BenjaminCharmes

pydatalab/src/pydatalab/routes/v0_1/admin.py

@@ -150,7 +150,7 @@ def list_access_tokens():
                 "active": 1,
                 "created_at": 1,
                 "invalidated_at": 1,
-                "token": {"$substr": ["$token", 0, 16]},
+                "token": "$token",
                 "item_name": {
                     "$cond": {
                         "if": {"$gt": [{"$size": "$item_info"}, 0]},

pydatalab/src/pydatalab/routes/v0_1/items.py

@@ -754,7 +754,6 @@ def update_item_permissions(refcode: str):
 
 
 @ITEMS.route("/items/<refcode>/issue-access-token", methods=["POST"])
-@active_users_or_get_only
 def issue_physical_token(refcode: str):
     """Issue a token that will give semi-permanent access to an
     item with this refcode. This should be used when generating
@@ -872,14 +871,9 @@ def get_item_data(item_id: str | None = None, refcode: str | None = None):
             redirect_url += f"?at={access_token}"
         return redirect(redirect_url, code=307)
 
-    valid_access_token: bool = False
+    valid_access_token = False
     if refcode and access_token:
         valid_access_token = check_access_token(refcode, access_token)
-        if not valid_access_token:
-            return (
-                jsonify({"status": "error", "message": "Invalid access token"}),
-                401,
-            )
 
     if item_id:
         match = {"item_id": item_id}
@@ -932,24 +926,6 @@ def get_item_data(item_id: str | None = None, refcode: str | None = None):
             404,
         )
 
-    if valid_access_token:
-        pass
-
-    elif (
-        not current_user.is_authenticated
-        and not CONFIG.TESTING
-        and doc["type"] != "starting_materials"
-    ):
-        return (
-            jsonify(
-                {
-                    "status": "error",
-                    "message": "Authentication required or invalid access token.",
-                }
-            ),
-            401,
-        )
-
     # determine the item type and validate according to the appropriate schema
     try:
         ItemModel = ITEM_MODELS[doc["type"]]

webapp/src/components/QRCode.vue

@@ -177,7 +177,7 @@ export default {
       }
     },
     hasExistingToken() {
-      return this.tokenInfo && this.publicToken && this.publicToken !== "existing-token";
+      return this.tokenInfo && this.publicToken === "existing-token";
     },
   },
   mounted() {
@@ -209,8 +209,7 @@ export default {
         if (response.ok && data.status === "success") {
           if (data.has_token) {
             this.tokenInfo = data.token_info;
-            this.isPublicMode = true;
-            this.publicToken = data.token_info.token;
+            this.publicToken = "existing-token";
           }
         } else if (response.status === 404) {
           console.debug("No access to item or item not found");

webapp/src/components/TokenTable.vue

@@ -14,9 +14,7 @@
     <tbody>
       <tr v-if="isLoading">
         <td colspan="6" class="text-center">
-          <div class="spinner-border spinner-border-sm" role="status">
-            <span class="visually-hidden">Loading...</span>
-          </div>
+          <div class="spinner-border spinner-border-sm" role="status"></div>
           Loading tokens...
         </td>
       </tr>

webapp/src/views/EditPage.vue

@@ -91,7 +91,7 @@
       </div>
     </div>
 
-    <FileSelectModal v-if="isAuthenticated" :item_id="item_id" />
+    <FileSelectModal :item_id="item_id" />
   </div>
 </template>
 
@@ -212,9 +212,6 @@ export default {
     itemApiUrl() {
       return API_URL + "/items/" + this.refcode;
     },
-    isAuthenticated() {
-      return this.$store.state.currentUserID != null;
-    },
   },
   watch: {
     // add a warning before leaving page if unsaved