Merge branch 'master' into feat/daily-affected

Author: slaveeks

src/resolvers/project.js

@@ -20,12 +20,12 @@ module.exports = {
     /**
      * Returns project's Model
      * @param {ResolverObj} _obj
-     * @param {String} id - project id
+     * @param {String} projectId - project id
      * @param {ContextFactories} factories - factories for working with models
      * @return {Promise<ProjectDBScheme>}
      */
-    async project(_obj, { id }, { factories }) {
-      return factories.projectsFactory.findById(id);
+    async project(_obj, { projectId }, { factories }) {
+      return factories.projectsFactory.findById(projectId);
     },
   },
   Mutation: {

src/typeDefs/project.ts

@@ -96,7 +96,7 @@ type Project {
   """
   Project's Event
   """
-  event(id: ID!): Event @requireAuth
+  event(id: ID!): Event
 
   """
   Project events
@@ -107,7 +107,7 @@ type Project {
 
     "Certain number of documents to skip"
     skip: Int = 0
-  ): [Event!] @requireAuth
+  ): [Event!]
 
   """
   Returns recent events grouped by day
@@ -124,7 +124,7 @@ type Project {
 
     "Event marks by which events should be sorted"
     filters: EventsFiltersInput
-  ): RecentEvents @requireAuth
+  ): RecentEvents
   """
   Return events that occurred after a certain timestamp
   """
@@ -138,23 +138,23 @@ type Project {
     User's local timezone offset in minutes
     """
     timezoneOffset: Int! = 0
-  ): [ChartDataItem] @requireAuth
+  ): [ChartDataItem]
   """
   Returns number of unread events
   """
-  unreadCount: Int! @requireAuth
+  unreadCount: Int!
 
   """
   Project notification settings
   """
-  notifications: [ProjectNotificationsRule] @requireAuth
+  notifications: [ProjectNotificationsRule]
 }
 
 extend type Query {
   """
   Returns project info
   """
-  project("Project id" id: ID!): Project @requireAuth
+  project("Project id" projectId: ID!): Project @requireUserInWorkspace
 }
 
 extend type Mutation {
@@ -200,7 +200,7 @@ extend type Mutation {
     Project image
     """
     image: Upload @uploadImage
-  ): Project! @requireAuth
+  ): Project! @requireAdmin
 
   """
   Generates new project integration token by id
@@ -228,6 +228,6 @@ extend type Mutation {
     project ID
     """
     projectId: ID!
-  ): DateTime! @requireAuth
+  ): DateTime! @requireUserInWorkspace
 }
 `;

src/typeDefs/workspace.ts

@@ -119,6 +119,9 @@ export default gql`
     """ True if workspace is used for debugging """
     isDebug: Boolean
 
+    """ True if workspace is blocked """
+    isBlocked: Boolean
+
     """
     Workspace projects array
     """