Merge branch 'master' into recent-items

graph/mutators/index.js

@@ -2,7 +2,6 @@ const _ = require('lodash');
 
 const Comment = require('./comment');
 const Action = require('./action');
-const User = require('./user');
 
 module.exports = (context) => {
 
@@ -10,7 +9,6 @@ module.exports = (context) => {
   return _.merge(...[
     Comment,
     Action,
-    User,
   ].map((mutators) => {
 
     // Each set of mutators is a function which takes the context.

graph/mutators/user.js

@@ -1,31 +0,0 @@
-const UsersService = require('../../services/users');
-
-/**
- * Updates a users settings.
- * @param  {Object} user the user performing the request
- * @param  {String} bio  the new user bio
- * @return {Promise}
- */
-const updateUserSettings = ({user}, {bio}) => {
-  return UsersService.updateSettings(user.id, {bio});
-};
-
-module.exports = (context) => {
-
-  // TODO: refactor to something that'll return an error in the event an attempt
-  // is made to mutate state while not logged in. There's got to be a better way
-  // to do this.
-  if (context.user && context.user.can('mutation:updateUserSettings')) {
-    return {
-      User: {
-        updateSettings: (settings) => updateUserSettings(context, settings)
-      }
-    };
-  }
-
-  return {
-    User: {
-      updateSettings: () => {}
-    }
-  };
-};

graph/resolvers/root_mutation.js

@@ -8,9 +8,6 @@ const RootMutation = {
   deleteAction(_, {id}, {mutators: {Action}}) {
     return Action.delete({id});
   },
-  updateUserSettings(_, {settings}, {mutators: {User}}) {
-    return User.updateSettings(settings);
-  }
 };
 
 module.exports = RootMutation;

graph/typeDefs.graphql

@@ -10,11 +10,6 @@ enum SORT_ORDER {
 # Date represented as an ISO8601 string.
 scalar Date
 
-type UserSettings {
-  # bio of the user.
-  bio: String
-}
-
 input CommentsQuery {
   # current status of a comment.
   statuses: [COMMENT_STATUS]
@@ -22,7 +17,7 @@ input CommentsQuery {
   # asset that a comment is on.
   asset_id: ID
 
-  # the parent of the comment that we want to retrive.
+  # the parent of the comment that we want to retrieve.
   parent_id: ID
 
   # comments returned will only be ones which have at least one action of this
@@ -61,8 +56,8 @@ type User {
   # the current roles of the user.
   roles: [USER_ROLES]
 
-  # settings for a user.
-  settings: UserSettings
+  # determines whether the user can edit their username
+  canEditName: Boolean
 
   # returns all comments based on a query.
   comments(query: CommentsQuery): [Comment]
@@ -153,7 +148,7 @@ type Asset {
   # The scraped title of the asset.
   title: String
 
-  # The URL that the asset is locaed on.
+  # The URL that the asset is located on.
   url: String
 
   # Returns recent comments
@@ -211,11 +206,6 @@ input CreateActionInput {
   item_id: ID!
 }
 
-input UpdateUserSettingsInput {
-  # user bio
-  bio: String!
-}
-
 type RootMutation {
   # creates a comment on the asset.
   createComment(asset_id: ID!, parent_id: ID, body: String!): Comment
@@ -226,8 +216,6 @@ type RootMutation {
   # delete an action based on the action id.
   deleteAction(id: ID!): Boolean
 
-  # updates a user's settings, it will return if the query was successful.
-  updateUserSettings(settings: UpdateUserSettingsInput!): Boolean
 }
 
 schema {