1 files changed, 13 insertions, 0 deletions
diff --git a/models/users.js b/models/users.js
index 4260dc56..1ea09a03 100644
--- a/models/users.js
+++ b/models/users.js
@@ -35,6 +35,19 @@ Users.helpers({
                           _.where(board.members, {userId: this._id})[0].isAdmin;
   },
 
+  getAvatarUrl() {
+    // Although we put the avatar picture URL in the `profile` object, we need
+    // to support Sandstorm which put in the `picture` attribute by default.
+    // XXX Should we move both cases to `picture`?
+    if (this.picture) {
+      return this.picture;
+    } else if (this.profile && this.profile.avatarUrl) {
+      return this.profile.avatarUrl;
+    } else {
+      return null;
+    }
+  },
+
   getInitials() {
     const profile = this.profile || {};
     if (profile.initials)