Merge branch 'dev' into three157

Author: DanielBelmes

packages/client-core/src/common/services/RouterService.ts

@@ -54,7 +54,9 @@ export type CustomRoute = {
  * @return {Promise}
  */
 export const getCustomRoutes = async (): Promise<CustomRoute[]> => {
-  const routes = (await Engine.instance.api.service(routePath).find({ query: { paginate: false } })) as RouteType[]
+  const routes = (await Engine.instance.api
+    .service(routePath)
+    .find({ query: { paginate: false } })) as any as RouteType[]
   console.log(routes)
 
   const elements: CustomRoute[] = []

packages/editor/src/functions/takeScreenshot.ts

@@ -192,9 +192,9 @@ export async function takeScreenshot(
   scenePreviewCamera.layers.disableAll()
   scenePreviewCamera.layers.set(ObjectLayers.Scene)
 
-  const selection = EngineRenderer.instance.effectComposer.HighlightEffect.selection.values()
+  const selection = EngineRenderer.instance.effectComposer.HighlightEffect?.selection.values()
   if (hideHelpers) {
-    EngineRenderer.instance.effectComposer.HighlightEffect.clearSelection()
+    EngineRenderer.instance.effectComposer.HighlightEffect?.clearSelection()
   }
 
   const originalSize = EngineRenderer.instance.renderer.getSize(new Vector2())
@@ -230,7 +230,7 @@ export async function takeScreenshot(
   EngineRenderer.instance.effectComposer.render()
 
   if (hideHelpers) {
-    EngineRenderer.instance.effectComposer.HighlightEffect.setSelection(selection)
+    EngineRenderer.instance.effectComposer.HighlightEffect?.setSelection(selection)
   }
 
   const canvas = getResizedCanvas(EngineRenderer.instance.renderer.domElement, width, height)

packages/server-core/src/media/oembed/oembed.class.ts

@@ -70,7 +70,9 @@ export class OembedService implements ServiceInterface<OembedType | BadRequest |
         query_url: queryURL
       } as OembedType
 
-      const activeRoutes = (await this.app.service(routePath).find({ query: { paginate: false } })) as RouteType[]
+      const activeRoutes = (await this.app
+        .service(routePath)
+        .find({ query: { paginate: false } })) as any as RouteType[]
       const uniqueProjects = [...new Set<string>(activeRoutes.map((item) => item.project))]
 
       for (const projectName of uniqueProjects) {

packages/server-core/src/route/route/route.class.ts

@@ -23,51 +23,17 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import type { NullableId, Params } from '@feathersjs/feathers'
-import type { KnexAdapterOptions } from '@feathersjs/knex'
-import { KnexAdapter, KnexAdapterParams } from '@feathersjs/knex'
+import type { Params } from '@feathersjs/feathers'
+import { KnexAdapterParams, KnexService } from '@feathersjs/knex'
 
 import { RouteData, RoutePatch, RouteQuery, RouteType } from '@etherealengine/engine/src/schemas/route/route.schema'
-import { Id } from '@feathersjs/feathers'
-import { Application } from '../../../declarations'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface RouteParams extends KnexAdapterParams<RouteQuery> {}
 
-export class RouteService<T = RouteType, ServiceParams extends Params = RouteParams> extends KnexAdapter<
+export class RouteService<T = RouteType, ServiceParams extends Params = RouteParams> extends KnexService<
   RouteType,
   RouteData,
   RouteParams,
   RoutePatch
-> {
-  app: Application
-
-  constructor(options: KnexAdapterOptions, app: Application) {
-    super(options)
-    this.app = app
-  }
-
-  async find(params?: RouteParams) {
-    if (params?.query?.paginate != null) {
-      if (params.query.paginate === false) params.paginate = params.query.paginate
-      delete params.query.paginate
-    }
-    return super._find(params)
-  }
-
-  async create(data: RouteData, params?: RouteParams) {
-    return super._create(data, params)
-  }
-
-  async get(id: Id, params?: RouteParams) {
-    return super._get(id, params)
-  }
-
-  async patch(id: Id, data: RouteData, params?: RouteParams) {
-    return super._patch(id, data, params)
-  }
-
-  async remove(id: NullableId, params?: RouteParams) {
-    return super._remove(id, params)
-  }
-}
+> {}

packages/server-core/src/route/route/route.hooks.ts

@@ -32,6 +32,7 @@ import {
   routeQueryValidator
 } from '@etherealengine/engine/src/schemas/route/route.schema'
 
+import enableClientPagination from '../../hooks/enable-client-pagination'
 import verifyScope from '../../hooks/verify-scope'
 import {
   routeDataResolver,
@@ -48,7 +49,7 @@ export default {
 
   before: {
     all: [() => schemaHooks.validateQuery(routeQueryValidator), schemaHooks.resolveQuery(routeQueryResolver)],
-    find: [],
+    find: [enableClientPagination()],
     get: [],
     create: [
       iff(isProvider('external'), verifyScope('admin', 'admin')),

packages/server-core/src/route/route/route.ts

@@ -123,7 +123,7 @@ export default (app: Application): void => {
     multi: true
   }
 
-  app.use(routePath, new RouteService(options, app), {
+  app.use(routePath, new RouteService(options), {
     // A list of all methods this service exposes externally
     methods: routeMethods,
     // You can add additional custom events to be sent to clients here

packages/server-core/src/user/identity-provider/identity-provider.class.ts

@@ -44,9 +44,9 @@ import { scopePath, ScopeType } from '@etherealengine/engine/src/schemas/scope/s
 import { userPath, UserType } from '@etherealengine/engine/src/schemas/user/user.schema'
 import { Application } from '../../../declarations'
 
+import { scopeTypePath } from '@etherealengine/engine/src/schemas/scope/scope-type.schema'
 import { KnexAdapterParams } from '@feathersjs/knex'
 import appConfig from '../../appconfig'
-import { scopeTypeSeed } from '../../scope/scope-type/scope-type.seed'
 import getFreeInviteCode from '../../util/get-free-invite-code'
 
 export interface IdentityProviderParams extends KnexAdapterParams<IdentityProviderQuery> {
@@ -255,7 +255,11 @@ export class IdentityProviderService<
         .createAccessToken({}, { subject: result.id.toString() })
     } else if (isDev && type === 'admin') {
       // in dev mode, add all scopes to the first user made an admin
-      const data = scopeTypeSeed.map(({ type }) => {
+      const scopeTypes = await this.app.service(scopeTypePath).find({
+        paginate: false
+      })
+
+      const data = scopeTypes.map(({ type }) => {
         return { userId, type }
       })
       await this.app.service(scopePath).create(data)

packages/server-core/src/user/login-token/login-token.class.ts

@@ -24,11 +24,7 @@ Ethereal Engine. All Rights Reserved.
 */
 
 import type { Params } from '@feathersjs/feathers'
-import type { KnexAdapterOptions } from '@feathersjs/knex'
-import { KnexAdapter } from '@feathersjs/knex'
-import crypto from 'crypto'
-import moment from 'moment'
-import config from '../../appconfig'
+import { KnexService } from '@feathersjs/knex'
 
 import {
   LoginTokenData,
@@ -38,8 +34,6 @@ import {
 } from '@etherealengine/engine/src/schemas/user/login-token.schema'
 
 import { KnexAdapterParams } from '@feathersjs/knex'
-import { Application } from '../../../declarations'
-import { toDateTimeSql } from '../../util/datetime-sql'
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface LoginTokenParams extends KnexAdapterParams<LoginTokenQuery> {}
@@ -48,21 +42,9 @@ export interface LoginTokenParams extends KnexAdapterParams<LoginTokenQuery> {}
  * A class for LoginToken service
  */
 
-export class LoginTokenService<T = LoginTokenType, ServiceParams extends Params = LoginTokenParams> extends KnexAdapter<
+export class LoginTokenService<T = LoginTokenType, ServiceParams extends Params = LoginTokenParams> extends KnexService<
   LoginTokenType,
   LoginTokenData,
   LoginTokenParams,
   LoginTokenPatch
-> {
-  app: Application
-
-  constructor(options: KnexAdapterOptions, app: Application) {
-    super(options)
-    this.app = app
-  }
-  async create(data: LoginTokenData, params?: LoginTokenParams) {
-    const token = crypto.randomBytes(config.authentication.bearerToken.numBytes).toString('hex')
-
-    return await super._create({ ...data, token, expiresAt: toDateTimeSql(moment().utc().add(2, 'days').toDate()) })
-  }
-}
+> {}

packages/server-core/src/user/login-token/login-token.resolvers.ts

@@ -30,7 +30,10 @@ import { v4 } from 'uuid'
 import { LoginTokenQuery, LoginTokenType } from '@etherealengine/engine/src/schemas/user/login-token.schema'
 import type { HookContext } from '@etherealengine/server-core/declarations'
 
-import { fromDateTimeSql, getDateTimeSql } from '../../util/datetime-sql'
+import crypto from 'crypto'
+import moment from 'moment'
+import config from '../../appconfig'
+import { fromDateTimeSql, getDateTimeSql, toDateTimeSql } from '../../util/datetime-sql'
 
 export const loginTokenResolver = resolve<LoginTokenType, HookContext>({
   expiresAt: virtual(async (loginToken) => fromDateTimeSql(loginToken.expiresAt)),
@@ -44,6 +47,13 @@ export const loginTokenDataResolver = resolve<LoginTokenType, HookContext>({
   id: async () => {
     return v4()
   },
+  token: async () => {
+    return crypto.randomBytes(config.authentication.bearerToken.numBytes).toString('hex')
+  },
+  expiresAt: async (value, message, context) => {
+    console.log('expiresAt context', context)
+    return context.data.expiresAt ? context.data.expiresAt : toDateTimeSql(moment().utc().add(2, 'days').toDate())
+  },
   createdAt: getDateTimeSql,
   updatedAt: getDateTimeSql
 })

packages/server-core/src/user/login-token/login-token.ts

@@ -44,7 +44,7 @@ export default (app: Application): void => {
     multi: true
   }
 
-  app.use(loginTokenPath, new LoginTokenService(options, app), {
+  app.use(loginTokenPath, new LoginTokenService(options), {
     // A list of all methods this service exposes externally
     methods: loginTokenMethods,
     // You can add additional custom events to be sent to clients here