@things-factory/auth-base 7.0.1-beta.13 → 7.0.1-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "7.0.1-beta.13",
+  "version": "7.0.1-beta.18",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,9 +30,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/email-base": "^7.0.1-beta.13",
-    "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/shell": "^7.0.1-beta.13",
+    "@things-factory/email-base": "^7.0.1-beta.18",
+    "@things-factory/env": "^7.0.1-beta.18",
+    "@things-factory/shell": "^7.0.1-beta.18",
     "@things-factory/utils": "^7.0.1-beta.10",
     "@types/webappsec-credential-management": "^0.6.8",
     "jsonwebtoken": "^9.0.0",
@@ -45,5 +45,5 @@
     "passport-local": "^1.0.0",
     "popsicle-cookie-jar": "^1.0.0"
   },
-  "gitHead": "e5eff2cffc574da35303589976fa15922c845fa5"
+  "gitHead": "44f0df6a133577bad8d184a529796c69249a8296"
 }

package/server/service/app-binding/app-binding-query.ts

@@ -22,7 +22,7 @@ export class AppBindingQuery {
 
   /* TODO optimize query */
   @Query(returns => AppBindingList)
-  async appBindings(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<UserList> {
+  async appBindings(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<UserList> {
     const { domain } = context.state
 
     // const convertedParams = convertListParams(params)

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

@@ -17,7 +17,10 @@ export class ApplianceQuery {
 
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => ApplianceList, { description: 'To fetch multiple appliance' })
-  async appliances(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApplianceList> {
+  async appliances(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ApplianceList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -35,7 +38,7 @@ export class ApplianceQuery {
 
   @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> {
+  async edges(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<ApplianceList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -24,7 +24,7 @@ export class ApplicationQuery {
 
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => ApplicationList, { description: 'To fetch multiple application' })
-  async applications(@Args() params: ListParam, @Ctx() context: ResolverContext) {
+  async applications(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext) {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/application/application.ts

@@ -131,14 +131,14 @@ export class Application {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((application: Application) => application.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((application: Application) => application.updater)

package/server/service/auth-provider/auth-provider-query.ts

@@ -25,7 +25,10 @@ export class AuthProviderQuery {
 
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => AuthProviderList, { description: 'To fetch multiple AuthProviders' })
-  async authProviders(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<AuthProviderList> {
+  async authProviders(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<AuthProviderList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/login-history/login-history-query.ts

@@ -9,7 +9,10 @@ import { LoginHistoryList } from './login-history-type'
 @Resolver(LoginHistory)
 export class LoginHistoryQuery {
   @Query(returns => LoginHistoryList, { description: 'To fetch multiple LoginHistories' })
-  async loginHistories(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LoginHistoryList> {
+  async loginHistories(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<LoginHistoryList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -12,7 +12,7 @@ import { PartnerList } from './partner-types'
 export class PartnerQuery {
   @Directive('@privilege(category: "partner", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => PartnerList)
-  async partners(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<PartnerList> {
+  async partners(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<PartnerList> {
     if (await checkUserBelongsDomain(context.state.domain, context.state.user)) {
       const { domain } = context.state
 
@@ -45,7 +45,10 @@ export class PartnerQuery {
 
   @Directive('@privilege(category: "partner", privilege: "query")')
   @Query(returns => DomainList)
-  async searchCustomers(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DomainList> {
+  async searchCustomers(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DomainList> {
     const { domain } = context.state
     const partners: Partner[] = await getRepository(Partner).find({
       where: { domain: { id: domain.id } },

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

@@ -10,7 +10,10 @@ import { PrivilegeList } from './privilege-types'
 export class PrivilegeQuery {
   @Directive('@privilege(category: "privilege", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => PrivilegeList, { description: 'To fetch multiple privileges' })
-  async privileges(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<PrivilegeList> {
+  async privileges(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<PrivilegeList> {
     const [items, total] = await getQueryBuilderFromListParams({
       params,
       repository: getRepository(Privilege),
@@ -29,13 +32,21 @@ export class PrivilegeQuery {
   }
 
   @Query(returns => Boolean, { description: 'To query whether I have the given permission' })
-  async hasPrivilege(@Arg('privilege') privilege: string, @Arg('category') category: string, @Ctx() context: ResolverContext): Promise<Boolean> {
+  async hasPrivilege(
+    @Arg('privilege') privilege: string,
+    @Arg('category') category: string,
+    @Ctx() context: ResolverContext
+  ): Promise<Boolean> {
     const { domain, user } = context.state
     return await User.hasPrivilege(privilege, category, domain, user)
   }
 
   @Query(returns => [Domain], { description: 'To fetch domains with given privilege for user' })
-  async domainsWithPrivilege(@Arg('privilege') privilege: string, @Arg('category') category: string, @Ctx() context: ResolverContext): Promise<Partial<Domain>[]> {
+  async domainsWithPrivilege(
+    @Arg('privilege') privilege: string,
+    @Arg('category') category: string,
+    @Ctx() context: ResolverContext
+  ): Promise<Partial<Domain>[]> {
     const { user } = context.state
     return await User.getDomainsWithPrivilege(privilege, category, user)
   }

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

@@ -24,7 +24,7 @@ export class RoleQuery {
 
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => RoleList, { description: 'To fetch multiple users' })
-  async roles(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<RoleList> {
+  async roles(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<RoleList> {
     const { domain } = context.state
 
     const [items, total] = await getQueryBuilderFromListParams({

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

@@ -27,7 +27,7 @@ export class UserQuery {
 
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => UserList, { description: 'To fetch multiple users' })
-  async users(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<UserList> {
+  async users(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<UserList> {
     const { domain } = context.state
 
     const qb = getQueryBuilderFromListParams({