@things-factory/auth-base 7.0.1-alpha.93 → 7.0.1-alpha.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "7.0.1-alpha.93",
+  "version": "7.0.1-alpha.96",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -45,5 +45,5 @@
     "passport-local": "^1.0.0",
     "popsicle-cookie-jar": "^1.0.0"
   },
-  "gitHead": "50cb52ff55459ed050508abea46b15e24973dd53"
+  "gitHead": "454f3e70a838f7cf177bcad936d335ad446093c8"
 }

package/server/constants/error-code.ts

@@ -16,3 +16,4 @@ export const USER_DUPLICATED = 'user duplicated'
 export const PASSWORD_USED_PAST = 'password used in the past'
 export const VERIFICATION_ERROR = 'user or verification token not found'
 export const USER_CREDENTIAL_NOT_FOUND = 'user credential not found'
+export const AUTH_ERROR = 'auth error'

package/server/middlewares/webauthn-middleware.ts

@@ -57,7 +57,14 @@ export async function webAuthnMiddleware(context, next) {
     { session: true, failureMessage: true, failWithError: true },
     async (err, user, info) => {
       if (err || !user) {
-        throw new AuthError(info)
+        if (info.errorCode) {
+          throw new AuthError(info)
+        } else {
+          throw new AuthError({
+            errorCode: AuthError.ERROR_CODES.AUTH_ERROR,
+            detail: info
+          })
+        }
       } else {
         context.state.user = user
 

package/server/service/appliance/appliance.ts

@@ -30,7 +30,8 @@ export class Appliance {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  domain: Domain
+  @Field(type => Domain)
+  domain?: Domain
 
   @RelationId((appliance: Appliance) => appliance.domain)
   domainId: string
@@ -71,8 +72,8 @@ export class Appliance {
       DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'longtext'
         : DATABASE_TYPE == 'oracle'
-        ? 'clob'
-        : 'varchar'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   @Directive('@privilege(category: "security", privilege: "query", domainOwnerGranted: true)')

package/server/service/application/application.ts

@@ -54,6 +54,7 @@ export class Application {
   readonly id?: string
 
   @ManyToOne(type => Domain)
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((application: Application) => application.domain)
@@ -97,8 +98,8 @@ export class Application {
       DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'longtext'
         : DATABASE_TYPE == 'oracle'
-        ? 'clob'
-        : 'varchar'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   @Directive('@privilege(category: "security", privilege: "query", domainOwnerGranted: true)')
@@ -113,8 +114,8 @@ export class Application {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: ApplicationType,
     default: ApplicationType.OTHERS
   })

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

@@ -19,8 +19,8 @@ export class GrantedRole {
   roleId: string
 
   @ManyToOne(type => Domain)
-  @Field()
-  domain: Domain
+  @Field(type => Domain)
+  domain?: Domain
 
   @RelationId((grantedRole: GrantedRole) => grantedRole.domain)
   domainId: string

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

@@ -14,14 +14,14 @@ export class LoginHistory {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field()
-  accessDomain: Domain
+  @Field(type => Domain)
+  accessDomain?: Domain
 
   @RelationId((loginHistory: LoginHistory) => loginHistory.accessDomain)
   accessDomainId: string
 
   @ManyToOne(type => User)
-  @Field()
+  @Field(type => User)
   accessUser: User
 
   @RelationId((loginHistory: LoginHistory) => loginHistory.accessUser)

package/server/service/partner/partner.ts

@@ -20,25 +20,25 @@ export class Partner {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field()
-  domain: Domain
+  @Field(type => Domain)
+  domain?: Domain
 
   @RelationId((partner: Partner) => partner.domain)
   domainId: string
 
   @ManyToOne(type => Domain)
-  @Field()
-  partnerDomain: Domain
+  @Field(type => Domain)
+  partnerDomain?: Domain
 
   @RelationId((partner: Partner) => partner.partnerDomain)
   partnerDomainId: string
 
   @CreateDateColumn()
-  @Field()
+  @Field({ nullable: true })
   requestedAt: Date
 
   @UpdateDateColumn()
-  @Field()
+  @Field({ nullable: true })
   approvedAt: Date
 
   @ManyToOne(type => User, { nullable: true })

package/server/service/role/role.ts

@@ -24,13 +24,14 @@ export class Role {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  domain: Domain
+  @Field(type => Domain)
+  domain?: Domain
 
   @RelationId((role: Role) => role.domain)
   domainId: string
 
   @Column()
-  @Field()
+  @Field({ nullable: true })
   name: string
 
   @ManyToMany(type => User, user => user.roles)

package/translations/en.json

@@ -1,4 +1,5 @@
 {
+  "error.auth error": "auth error. {message}",
   "error.confirm password not matched": "new password and confirm password is not matched",
   "error.domain mismatch": "certificate is not for this domain",
   "error.domain not allowed": "user not allowed domain `{subdomain}`",
@@ -54,4 +55,4 @@
   "text.user credential registered successfully": "device registration has been successfully completed. You can now use biometric authentication.",
   "text.user registered successfully": "user registered successfully. find your email to activate account",
   "text.verification email sent": "verification email sent"
-}
+}

package/translations/ja.json

@@ -1,4 +1,5 @@
 {
+  "error.auth error": "認証エラー。{message}",
   "error.confirm password not matched": "新しいパスワードと確認パスワードが一致しません.",
   "error.domain mismatch": "証明書のドメインと現在のドメインが一致しません.",
   "error.domain not allowed": "'{subdomain}' 領域はこのユーザに許可されていません.",
@@ -54,4 +55,4 @@
   "text.user credential registered successfully": "デバイスの登録が正常に完了しました。今後は生体認証を使用できます。",
   "text.user registered successfully": "ユーザーが正常に登録されました. 確認メールでアカウントを有効にしてください.",
   "text.verification email sent": "確認メールを送りました."
-}
+}

package/translations/ko.json

@@ -1,4 +1,5 @@
 {
+  "error.auth error": "인증 오류. {message}",
   "error.confirm password not matched": "새 비밀번호와 확인 비밀번호가 일치하지 않습니다.",
   "error.domain mismatch": "인증서의 도메인과 현재 도메인이 일치하지 않습니다.",
   "error.domain not allowed": "'{subdomain}' 영역은 이 사용자에게 허가되지 않았습니다.",
@@ -54,4 +55,4 @@
   "text.user credential registered successfully": "기기 등록이 성공적으로 완료되었습니다. 이제 바이오메트릭 인증을 사용할 수 있습니다.",
   "text.user registered successfully": "사용자가 성공적으로 등록되었습니다. 확인 이메일을 통해서 계정을 활성화하시기 바랍니다.",
   "text.verification email sent": "확인 이메일을 보냈습니다."
-}
+}

package/translations/ms.json

@@ -1,4 +1,5 @@
 {
+  "error.auth error": "ralat pengesahan. {message}",
   "error.confirm password not matched": "Kata laluan baru dan pengesahan kata laluan tidak sepadan",
   "error.domain mismatch": "Sijil tidak sesuai untuk domain ini",
   "error.domain not allowed": "Pengguna tidak dibenarkan domain `{subdomain}`",
@@ -54,4 +55,4 @@
   "text.user credential registered successfully": "pendaftaran peranti berjaya diselesaikan. Kini anda boleh menggunakan pengesahan biometrik.",
   "text.user registered successfully": "Pengguna berjaya didaftarkan. Cari e-mel anda untuk mengaktifkan akaun",
   "text.verification email sent": "E-mel pengesahan telah dihantar"
-}
+}

package/translations/zh.json

@@ -1,4 +1,5 @@
 {
+  "error.auth error": "认证错误。{message}",
   "error.confirm password not matched": "新密码与确认密码不匹配！",
   "error.domain mismatch": "证书不适用于该域！",
   "error.domain not allowed": "用户无权限使用`{subdomain}`域！",
@@ -54,4 +55,4 @@
   "text.user credential registered successfully": "设备注册已成功完成。现在可以使用生物识别认证。",
   "text.user registered successfully": "用户注册成功。 请查看电子邮件以激活帐户。",
   "text.verification email sent": "验证邮件已发送"
-}
+}