Fixes from @singingwolfboy in PR #3466

common/lib/xmodule/xmodule/textannotation_module.py

@@ -61,9 +61,9 @@ class TextAnnotationModule(AnnotatableFields, XModule):
 
         self.instructions = self._extract_instructions(xmltree)
         self.content = etree.tostring(xmltree, encoding='unicode')
-        self.user = ""
+        self.user_email = ""
         if self.runtime.get_real_user is not None:
-            self.user = self.runtime.get_real_user(self.runtime.anonymous_student_id).email
+            self.user_email = self.runtime.get_real_user(self.runtime.anonymous_student_id).email
 
     def _extract_instructions(self, xmltree):
         """ Removes <instructions> from the xmltree and returns them as a string, otherwise None. """
@@ -83,7 +83,7 @@ class TextAnnotationModule(AnnotatableFields, XModule):
             'instructions_html': self.instructions,
             'content_html': self.content,
             'annotation_storage': self.annotation_storage_url,
-            'token':retrieve_token(self.user, self.annotation_token_secret),
+            'token': retrieve_token(self.user_email, self.annotation_token_secret),
         }
         return self.system.render_template('textannotation.html', context)
 

common/lib/xmodule/xmodule/videoannotation_module.py

@@ -56,9 +56,9 @@ class VideoAnnotationModule(AnnotatableFields, XModule):
 
         self.instructions = self._extract_instructions(xmltree)
         self.content = etree.tostring(xmltree, encoding='unicode')
-        self.user = ""
+        self.user_email = ""
         if self.runtime.get_real_user is not None:
-            self.user = self.runtime.get_real_user(self.runtime.anonymous_student_id).email
+            self.user_email = self.runtime.get_real_user(self.runtime.anonymous_student_id).email
 
     def _extract_instructions(self, xmltree):
         """ Removes <instructions> from the xmltree and returns them as a string, otherwise None. """
@@ -93,7 +93,7 @@ class VideoAnnotationModule(AnnotatableFields, XModule):
             'poster': self.poster_url,
             'content_html': self.content,
             'annotation_storage': self.annotation_storage_url,
-            'token': retrieve_token(self.user, self.annotation_token_secret),
+            'token': retrieve_token(self.user_email, self.annotation_token_secret),
         }
 
         return self.system.render_template('videoannotation.html', context)

common/static/js/vendor/ova/annotator-full-firebase-auth.js

 Annotator.Plugin.Auth.prototype.haveValidToken = function() {
-    var allFields;
-    allFields = this._unsafeToken && this._unsafeToken.d.issuedAt && this._unsafeToken.d.ttl && this._unsafeToken.d.consumerKey;
-    if (allFields && this.timeToExpiry() > 0) {
-      return true;
-    } else {
-      return false;
-    }
+    return (
+      this._unsafeToken &&
+      this._unsafeToken.d.issuedAt &&
+      this._unsafeToken.d.ttl &&
+      this._unsafeToken.d.consumerKey &&
+      this.timeToExpiry() > 0
+    );
 };
 
 Annotator.Plugin.Auth.prototype.timeToExpiry = function() {