Merge pull request #22 from QuickBlox/dev/v2.0.0-alpha.3

Release v2.0.0-alpha.3

Author: andrii-khomutovskyi-qb

bin/config.js

@@ -21,7 +21,8 @@ const fields = [
   'SERVER_APP_URL',
   'DEFAULT_LANGUAGE',
   'FILE_SIZE_LIMIT',
-  'FILE_EXTENSIONS_WHITELIST'
+  'FILE_EXTENSIONS_WHITELIST',
+  'ENABLE_GUEST_CLIENT',
 ]
 
 const parseValue = (value) => {

bin/initConfig.js

@@ -39,6 +39,7 @@ function getBaseConfiguration() {
   const ENABLE_REDUX_LOGGER = readline.keyInYN(`Enable Redux logger?\n`) || false
   const CLIENT_APP_URL = readline.question(`Enter Client app URL (optional):\n`, { defaultInput: DEFAULT_CLIENT_APP_URL, limit: /^https?:\/\/[^\s\/$.?#].[^\s]*$/ })
   const SERVER_APP_URL = readline.question(`Enter Server app URL (optional):\n`, { defaultInput: DEFAULT_SERVER_APP_URL, limit: /^https?:\/\/[^\s\/$.?#].[^\s]*$/ })
+  const ENABLE_GUEST_CLIENT = readline.keyInYN(`Enable Guest Client?\n`) || false
   const DEFAULT_LANGUAGE = readline.question(`Enter default language (optional) [en/ua]:\n`, { defaultInput: 'en', limit: ['en', 'ua'] })
   const FILE_SIZE_LIMIT = readline.questionInt(`Enter a file size limit in bytes (optional):\n`, { defaultInput: DEFAULT_FILE_SIZE_LIMIT })
   const FILE_EXTENSIONS_WHITELIST = readline.question(`Enter a space-separated list of available file extensions (optional):\n`, { defaultInput: DEFAULT_FILE_EXTENSIONS_WHITELIST })
@@ -65,6 +66,7 @@ function getBaseConfiguration() {
     DEFAULT_LANGUAGE,
     FILE_SIZE_LIMIT,
     FILE_EXTENSIONS_WHITELIST,
+    ENABLE_GUEST_CLIENT,
   }
 }
 

packages/api/src/plugins/env.ts

@@ -20,6 +20,7 @@ const schema = Type.Object({
   AI_QUICK_ANSWER: Type.Boolean({ default: false }),
   AI_SUGGEST_PROVIDER: Type.Boolean({ default: false }),
   AI_RECORD_ANALYTICS: Type.Boolean({ default: false }),
+  ENABLE_GUEST_CLIENT: Type.Boolean({ default: false }),
 })
 
 const options = {

packages/api/src/routes/appointments/getMyList.ts

@@ -1,6 +1,6 @@
 import { FastifyPluginAsyncTypebox } from '@fastify/type-provider-typebox'
-import { Type } from '@sinclair/typebox'
-import { QBAppointment } from 'quickblox'
+import { Static, Type } from '@sinclair/typebox'
+import { QBAppointment, QBSession } from 'quickblox'
 import omit from 'lodash/omit'
 
 import {
@@ -61,10 +61,32 @@ const getMyAppointmentListSchema = {
 }
 
 const getMyAppointmentList: FastifyPluginAsyncTypebox = async (fastify) => {
+  const handleValidate = async (
+    session: QBSession,
+    query: Static<typeof getMyAppointmentListSchema.querystring>,
+  ) => {
+    const { provider_id, client_id } = query
+    const user = await findUserById(session.user_id)
+    const isProvider = userHasTag(user!, 'provider')
+
+    if (isProvider && provider_id) {
+      return fastify.httpErrors.forbidden('body/provider_id Forbidden property')
+    }
+
+    if (!isProvider && client_id) {
+      return fastify.httpErrors.forbidden('body/client_id Forbidden property')
+    }
+
+    return undefined
+  }
+
   fastify.get(
     '/my',
     {
       schema: getMyAppointmentListSchema,
+      preHandler: (request, reply, done) => {
+        handleValidate(request.session!, request.query).then(done).catch(done)
+      },
       onRequest: fastify.verify(fastify.SessionToken),
     },
     async (request) => {

packages/api/src/routes/auth/login.ts

@@ -28,7 +28,7 @@ const login: FastifyPluginAsyncTypebox = async (fastify) => {
   fastify.post('/login', { schema: loginSchema }, async (request, reply) => {
     const { role, email, password } = request.body
     const session = await qbCreateSession()
-    const user = await qbLogin(email, password)
+    const user = await qbLogin({ email, password })
     const isProvider = userHasTag(user, 'provider')
 
     if (role === 'provider' ? isProvider : !isProvider) {

packages/api/src/routes/users/client/signup.ts

@@ -57,7 +57,7 @@ const signup: FastifyPluginAsyncTypebox = async (fastify) => {
       ...userData,
       custom_data: stringifyUserCustomData(customData),
     })
-    let user = await qbLogin(email, password)
+    let user = await qbLogin({ email, password })
 
     if (avatar) {
       const file = await qbUploadFile(avatar)

packages/api/src/routes/users/guest-client/create.ts

@@ -0,0 +1,44 @@
+import { FastifyPluginAsyncTypebox } from '@fastify/type-provider-typebox'
+import { Type } from '@sinclair/typebox'
+import { QBCreateUserWithLogin } from 'quickblox'
+import { randomBytes } from 'crypto'
+
+import { QBSession, QBUser, QCClient } from '@/models'
+import { qbCreateSession, qbLogin } from '@/services/quickblox/auth'
+import { qbCreateUser } from '@/services/quickblox/users'
+
+export const createGuestClientSchema = {
+  tags: ['Users', 'Client'],
+  summary: 'Create Guest client',
+  body: Type.Pick(QCClient, ['full_name']),
+  response: {
+    200: Type.Object({
+      session: Type.Ref(QBSession),
+      user: Type.Ref(QBUser),
+    }),
+  },
+  security: [{ apiKey: [] }, { providerSession: [] }] as Security,
+}
+
+const createGuestClient: FastifyPluginAsyncTypebox = async (fastify) => {
+  fastify.post('', { schema: createGuestClientSchema }, async (request) => {
+    const { full_name } = request.body
+    const login = Date.now().toString()
+    const password = randomBytes(8).toString('hex')
+    const session = await qbCreateSession()
+
+    await qbCreateUser<QBCreateUserWithLogin>({
+      login,
+      password,
+      full_name,
+      tag_list: 'guest',
+    })
+    const user = await qbLogin({ login, password })
+
+    return { session, user }
+  })
+}
+
+export const autoload = JSON.parse<boolean>(process.env.ENABLE_GUEST_CLIENT!)
+
+export default createGuestClient

packages/api/src/routes/users/provider/signup.ts

@@ -70,7 +70,7 @@ const signup: FastifyPluginAsyncTypebox = async (fastify) => {
       }),
       tag_list: ['provider'],
     })
-    let user = await qbLogin(email, password)
+    let user = await qbLogin({ email, password })
 
     if (avatar) {
       const file = await qbUploadFile(avatar)

packages/api/src/services/quickblox/auth.ts

@@ -69,9 +69,19 @@ export const qbGetSession = () => {
   })
 }
 
-export const qbLogin = (email: string, password: string) =>
+type LoginCredentials =
+  | {
+      login: string
+      password: string
+    }
+  | {
+      email: string
+      password: string
+    }
+
+export const qbLogin = (credentials: LoginCredentials) =>
   new Promise<QBUser>((resolve, reject) => {
-    QB.login({ email, password }, (error, result) => {
+    QB.login(credentials, (error, result) => {
       if (error) {
         reject(error)
       } else {

packages/api/src/types/quickblox.d.ts

@@ -459,7 +459,7 @@ declare module 'quickblox' {
     login: string
     password: string
     blob_id?: number
-    custom_data: string | null
+    custom_data?: string | null
     email?: string
     external_user_id?: string | number
     facebook_id?: string
@@ -538,6 +538,20 @@ declare module 'quickblox' {
     ): void
   }
 
+  type QBLoginParams =
+    | {
+        login: string
+        password: string
+      }
+    | {
+        email: string
+        password: string
+      }
+    | {
+        provider: 'firebase_phone'
+        firebase_phone: { access_token: string; project_id: string }
+      }
+
   interface Quickblox {
     buildNumber: string
     chat: QBChatModule