Matteo/gql

.editorconfig

@@ -7,3 +7,4 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+spaces_around_brackets = both

.eslintrc.json

@@ -7,13 +7,46 @@
     "parserOptions": {
         "ecmaVersion": 11
     },
-    "ignorePatterns": [ "modules/*/tests/*", "node_modules/*", "frontend/*"],
+    "ignorePatterns": [
+        "modules/*/tests/*",
+        "node_modules/*",
+        "frontend/*"
+    ],
     "rules": {
-      "arrow-spacing": [ 2, { "before": true, "after": true } ],
-      "array-bracket-spacing": [ 2, "always" ],
-      "block-spacing": [ 2, "always" ],
-      "camelcase": [ 1, { "properties": "always" } ],
-      "space-in-parens": [ 2, "always" ],
-      "keyword-spacing": 2
+        "arrow-spacing": [
+            2,
+            {
+                "before": true,
+                "after": true
+            }
+        ],
+        "array-bracket-spacing": [
+            2,
+            "always"
+        ],
+        "block-spacing": [
+            2,
+            "always"
+        ],
+        "camelcase": [
+            1,
+            {
+                "properties": "always"
+            }
+        ],
+        "space-in-parens": [
+            2,
+            "always"
+        ],
+        "keyword-spacing": 2,
+        "semi": "off",
+        "indent": [
+            "error",
+            2
+        ],
+        "padded-blocks": [
+            "error",
+            "never"
+        ]
     }
-}
+}

modules/core/graph/resolvers/streams.js

@@ -22,6 +22,28 @@ module.exports = {
 
       let stream = await getStream( { streamId: args.id } )
       return stream
+    },
+    async streams( parent, args, context, info ) {
+      await validateScopes( context.scopes, 'streams:read' )
+
+      if ( args.limit && args.limit > 100 )
+        throw new UserInputError( 'Cannot return more than 100 results.' )
+
+      let totalCount = await getUserStreamsCount( {userId: context.userId, publicOnly: false} )
+
+      let {cursor, streams} = await getUserStreams( {userId: context.userId, limit: args.limit, cursor: args.cursor, publicOnly: false} )
+      return {totalCount, cursor: cursor, items: streams}
+    },
+    async streamSearch( parent, args, context, info ) {
+      await validateScopes( context.scopes, 'streams:read' )
+
+      if ( args.limit && args.limit > 100 ) 
+        throw new UserInputError( 'Cannot return more than 100 results.' )
+
+      let totalCount = await getUserStreamsCount( {userId: context.userId, publicOnly: false, searchQuery: args.query} )
+
+      let {cursor, streams} = await getUserStreams( {userId: context.userId, limit: args.limit, cursor: args.cursor, publicOnly: false, searchQuery: args.query} )
+      return {totalCount, cursor: cursor, items: streams}
     }
   },
   Stream: {
@@ -35,6 +57,8 @@ module.exports = {
   User: {
 
     async streams( parent, args, context, info ) {
+      if ( args.limit && args.limit > 100 )
+        throw new UserInputError( 'Cannot return more than 100 results.' )
       // Return only the user's public streams if parent.id !== context.userId
       let publicOnly = parent.id !== context.userId
       let totalCount = await getUserStreamsCount( { userId: parent.id, publicOnly } )

modules/core/graph/resolvers/user.js → modules/core/graph/resolvers/users.js

@@ -1,7 +1,7 @@
 'use strict'
 const appRoot = require( 'app-root-path' )
 const { ApolloError, AuthenticationError, UserInputError } = require( 'apollo-server-express' )
-const { createUser, getUser, getUserByEmail, getUserRole, updateUser, deleteUser, validatePasssword } = require( '../../services/users' )
+const { createUser, getUser, getUserByEmail, getUserRole, updateUser, deleteUser, searchUsers, validatePasssword } = require( '../../services/users' )
 const { createPersonalAccessToken, createAppToken, revokeToken, revokeTokenById, validateToken, getUserTokens } = require( '../../services/tokens' )
 const { validateServerRole, validateScopes, authorizeResolver } = require( `${appRoot}/modules/shared` )
 const setupCheck = require( `${appRoot}/setupcheck` )
@@ -10,12 +10,11 @@ const zxcvbn = require( 'zxcvbn' )
 module.exports = {
   Query: {
 
-    async _( ) {
+    async _() {
       return `Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn.`
     },
 
     async user( parent, args, context, info ) {
-
       await validateServerRole( context, 'server:user' )
 
       if ( !args.id )
@@ -30,6 +29,22 @@ module.exports = {
       return await getUser( args.id || context.userId )
     },
 
+    async userSearch( parent, args, context, info ) {
+      await validateServerRole( context, 'server:user' )
+      await validateScopes( context.scopes, 'profile:read' )
+      await validateScopes( context.scopes, 'users:read' )
+
+      if ( args.query.length < 3 ) 
+        throw new UserInputError( 'Search query must be at least 3 carachters.' )
+
+
+      if ( args.limit  && args.limit > 100 ) 
+        throw new UserInputError( 'Cannot return more than 100 results.' )
+
+      let {cursor, users} = await searchUsers( args.query, args.limit, args.cursor )
+      return {cursor: cursor, items: users}
+    },
+
     async userPwdStrength( parent, args, context, info ) {
       let res = zxcvbn( args.pwd )
       return { score: res.score, feedback: res.feedback }
@@ -64,11 +79,13 @@ module.exports = {
 
   },
 
+
+
   Mutation: {
     async userEdit( parent, args, context, info ) {
       await validateServerRole( context, 'server:user' )
       await updateUser( context.userId, args.user )
       return true
     }
   }
-}
+}

modules/core/graph/schemas/streams.graphql

@@ -1,5 +1,7 @@
 extend type Query {
   stream( id: String! ): Stream
+  streams( limit: Int! = 100, cursor: String ): StreamCollection
+  streamSearch( query: String!, limit: Int! = 100, cursor: String ): StreamCollection
 }
 
 type Stream {
@@ -16,7 +18,7 @@ extend type User {
   """
   All the streams that a user has access to.
   """
-  streams( limit: Int! = 20, cursor: String ): StreamCollectionUser
+  streams( limit: Int! = 20, cursor: String ): StreamCollection
 }
 
 type StreamCollaborator {
@@ -25,12 +27,13 @@ type StreamCollaborator {
   role: String!
 }
 
-type StreamCollectionUser {
+type StreamCollection {
   totalCount: Int!
   cursor: String
   items: [ Stream ]
 }
 
+
 extend type Mutation {
   """
   Creates a new stream.

modules/core/graph/schemas/user.graphql

@@ -3,6 +3,7 @@ extend type Query {
   Gets the profile of a user. If no id argument is provided, will return the current authenticated user's profile (as extracted from the authorization header).
   """
   user( id: String ): User
+  userSearch( query: String!, limit: Int! = 100, cursor: String ): UserSearchResultCollection
   userPwdStrength( pwd: String! ): JSONObject
 }
 
@@ -22,6 +23,23 @@ type User {
   role: String
 }
 
+type UserSearchResultCollection {
+  cursor: String
+  items: [ UserSearchResult ]
+}
+
+type UserSearchResult {
+  id: String!
+  username: String
+  name: String
+  bio: String
+  company: String
+  avatar: String
+  verified: Boolean
+  profiles: JSONObject
+  role: String
+}
+
 extend type Mutation {
   """
   Edits a user's profile.

modules/core/services/branches.js

@@ -10,7 +10,6 @@ const BranchCommits = ( ) => knex( 'branch_commits' )
 module.exports = {
 
   async createBranch( { name, description, streamId, authorId } ) {
-
     let branch = {}
     branch.id = crs( { length: 10 } )
     branch.streamId = streamId

modules/core/services/streams.js

@@ -89,10 +89,10 @@ module.exports = {
     return await Streams( ).where( { id: streamId } ).del( )
   },
 
-  async getUserStreams( { userId, limit, cursor, publicOnly } ) {
+  async getUserStreams( {userId, limit, cursor, publicOnly, searchQuery } ) {
     limit = limit || 100
     publicOnly = publicOnly !== false //defaults to true if not provided
-
+    let likeQuery = "%" + searchQuery + "%"
     let query = Acl( )
       .columns( [ { id: 'streams.id' }, 'name', 'description', 'isPublic', 'createdAt', 'updatedAt', 'role' ] ).select( )
       .join( 'streams', 'stream_acl.resourceId', 'streams.id' )
@@ -104,34 +104,47 @@ module.exports = {
     if ( publicOnly )
       query.andWhere( 'streams.isPublic', true )
 
+    if ( searchQuery )
+      query.andWhere( function () {
+        this.where( 'name', 'ILIKE', likeQuery )
+          .orWhere( 'description', 'ILIKE', likeQuery )
+          .orWhere( 'id', 'ILIKE', likeQuery ) //potentially useless?
+      } )
+
     query.orderBy( 'streams.updatedAt', 'desc' ).limit( limit )
 
     let rows = await query
     return { streams: rows, cursor: rows.length > 0 ? rows[ rows.length - 1 ].updatedAt.toISOString( ) : null }
   },
 
-  async getUserStreamsCount( { userId, publicOnly } ) {
-
+  async getUserStreamsCount( {userId, publicOnly, searchQuery } ) {
     publicOnly = publicOnly !== false //defaults to true if not provided
-
+    let likeQuery = "%" + searchQuery + "%"
     let query = Acl( ).count( )
       .join( 'streams', 'stream_acl.resourceId', 'streams.id' )
       .where( { userId: userId } )
 
     if ( publicOnly )
       query.andWhere( 'streams.isPublic', true )
 
+    if ( searchQuery )
+      query.andWhere( function () {
+        this.where( 'name', 'ILIKE', likeQuery )
+          .orWhere( 'description', 'ILIKE', likeQuery )
+          .orWhere( 'id', 'ILIKE', likeQuery ) //potentially useless?
+      } )
+
     let [ res ] = await query
     return parseInt( res.count )
   },
 
   async getStreamUsers( { streamId } ) {
     let query =
       Acl( ).columns( { role: 'stream_acl.role' }, 'id', 'name' ).select( )
-      .where( { resourceId: streamId } )
-      .rightJoin( 'users', { 'users.id': 'stream_acl.userId' } )
-      .select( 'stream_acl.role', 'username', 'name', 'id' )
-      .orderBy( 'stream_acl.role' )
+        .where( { resourceId: streamId } )
+        .rightJoin( 'users', { 'users.id': 'stream_acl.userId' } )
+        .select( 'stream_acl.role', 'username', 'name', 'id' )
+        .orderBy( 'stream_acl.role' )
 
     return await query
   }