@things-factory/auth-base 7.0.0-alpha.8 → 7.0.1-alpha.0

package/dist-server/types.d.ts

@@ -5,13 +5,13 @@ import { User } from './service/user/user';
 declare global {
     export type ResolverContext = {
         state: IContextState;
-        t: TFunction;
+        t?: TFunction;
         [key: string]: any;
     };
     interface IContextState {
         domain: Domain;
         user: User;
-        tx: EntityManager;
+        tx?: EntityManager;
         [key: string]: any;
     }
 }

package/dist-server/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../server/types.ts"],"names":[],"mappings":"","sourcesContent":["import { TFunction } from 'i18next'\nimport { EntityManager } from 'typeorm'\n\nimport { Domain } from '@things-factory/shell'\n\nimport { User } from './service/user/user'\n\ndeclare global {\n  export type ResolverContext = {\n    state: IContextState\n    t: TFunction\n    [key: string]: any\n  }\n\n  interface IContextState {\n    domain: Domain\n    user: User\n    tx: EntityManager\n    [key: string]: any\n  }\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../server/types.ts"],"names":[],"mappings":"","sourcesContent":["import { TFunction } from 'i18next'\nimport { EntityManager } from 'typeorm'\n\nimport { Domain } from '@things-factory/shell'\n\nimport { User } from './service/user/user'\n\ndeclare global {\n  export type ResolverContext = {\n    state: IContextState\n    t?: TFunction\n    [key: string]: any\n  }\n\n  interface IContextState {\n    domain: Domain\n    user: User\n    tx?: EntityManager\n    [key: string]: any\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.1-alpha.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,11 +30,11 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/email-base": "^7.0.0-alpha.8",
-    "@things-factory/env": "^7.0.0-alpha.0",
-    "@things-factory/i18n-base": "^7.0.0-alpha.8",
-    "@things-factory/shell": "^7.0.0-alpha.8",
-    "@things-factory/utils": "^7.0.0-alpha.0",
+    "@things-factory/email-base": "^7.0.1-alpha.0",
+    "@things-factory/env": "^7.0.1-alpha.0",
+    "@things-factory/i18n-base": "^7.0.1-alpha.0",
+    "@things-factory/shell": "^7.0.1-alpha.0",
+    "@things-factory/utils": "^7.0.1-alpha.0",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
     "koa-session": "^6.4.0",
@@ -43,5 +43,5 @@
     "passport-local": "^1.0.0",
     "popsicle-cookie-jar": "^1.0.0"
   },
-  "gitHead": "b4981ea2721e7eaf4dbd618b6c77316ebc000ee5"
+  "gitHead": "d18cdb7648bd2003f11278ec7bc8df74edbd31fc"
 }

package/server/middlewares/domain-authenticate-middleware.ts

@@ -19,10 +19,14 @@ declare global {
 }
 
 process.domainOwnerGranted = async (domain: Domain, user: User): Promise<boolean> => {
-  return domain && domain.owner === user.id
+  return user && domain && domain.owner === user.id
 }
 
 process.superUserGranted = async (domain: Domain, user: User): Promise<boolean> => {
+  if (!user) {
+    return false
+  }
+
   if (!user.domains.length) {
     user = await getRepository(User).findOne({
       where: { id: user.id },

package/server/service/appliance/appliance-query.ts

@@ -33,6 +33,24 @@ export class ApplianceQuery {
     return { items, total }
   }
 
+  @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
+  @Query(returns => ApplianceList, { description: 'To fetch multiple appliance' })
+  async edges(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApplianceList> {
+    const { domain } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: getRepository(Appliance),
+      alias: 'appliance',
+      searchables: ['name', 'description']
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return { items, total }
+  }
+
   @FieldResolver(type => String)
   async accessToken(@Root() appliance: Appliance, @Ctx() context: ResolverContext) {
     return appliance.accessToken

package/server/service/user/user-query.ts

@@ -83,38 +83,6 @@ export class UserQuery {
     return Boolean(defaultPassword)
   }
 
-  // @Query(returns => [User], { description: '...' })
-  // async domainUsers(@Ctx() context: ResolverContext): Promise<User[]> {
-  //   const { domain } = context.state
-
-  //   const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id, 'USER')
-  //   const domainUsers: User[] = await qb
-  //     .orWhere(qb => {
-  //       const subQuery = qb
-  //         .subQuery()
-  //         .select('CAST(APPLICATION.id as TEXT)')
-  //         .from(Application, 'APPLICATION')
-  //         .where('APPLICATION.domain_id = :domainId', { domainId: domain.id })
-  //         .getQuery()
-  //       return 'USER.reference IN ' + subQuery
-  //     })
-  //     .orWhere(qb => {
-  //       const subQuery = qb
-  //         .subQuery()
-  //         .select('CAST(APPLIANCE.id as TEXT)')
-  //         .from(Appliance, 'APPLIANCE')
-  //         .where('APPLIANCE.domain_id = :domainId', { domainId: domain.id })
-  //         .getQuery()
-  //       return 'USER.reference IN ' + subQuery
-  //     })
-  //     .getMany()
-
-  //   return domainUsers.map((user: User & { owner: boolean }) => {
-  //     user.owner = user.id === domain.owner
-  //     return user
-  //   })
-  // }
-
   @Directive('@privilege(category: "user", privilege: "query")')
   @Query(returns => Boolean, { description: '...' })
   async checkUserExistence(@Arg('email', type => GraphQLEmailAddress) email: string): Promise<Boolean> {

package/server/types.ts

@@ -8,14 +8,14 @@ import { User } from './service/user/user'
 declare global {
   export type ResolverContext = {
     state: IContextState
-    t: TFunction
+    t?: TFunction
     [key: string]: any
   }
 
   interface IContextState {
     domain: Domain
     user: User
-    tx: EntityManager
+    tx?: EntityManager
     [key: string]: any
   }
 }