wabe 0.6.3 → 0.6.5

package/generated/schema.graphql

@@ -11,7 +11,7 @@ enum AuthenticationProvider {
 }
 
 enum SecondaryFactor {
-  EmailOTP
+  emailOTP
 }
 
 """Object containing information about the file"""
@@ -41,6 +41,7 @@ type User {
   verifiedEmail: Boolean
   role: Role
   sessions: _SessionConnection
+  secondFA: UserSecondFA
 }
 
 """Email scalar type"""
@@ -68,6 +69,7 @@ type UserAuthentication {
   emailPassword: UserAuthenticationEmailPassword
   google: UserAuthenticationGoogle
   github: UserAuthenticationGithub
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRP
 }
 
 type UserAuthenticationPhonePassword {
@@ -94,6 +96,12 @@ type UserAuthenticationGithub {
   username: String!
 }
 
+type UserAuthenticationEmailPasswordSRP {
+  salt: String!
+  verifier: String!
+  serverSecret: String
+}
+
 type _SessionConnection {
   totalCount: Int
   edges: [_SessionEdge]
@@ -103,6 +111,11 @@ type _SessionEdge {
   node: _Session!
 }
 
+type UserSecondFA {
+  enabled: Boolean!
+  provider: SecondaryFactor!
+}
+
 """User class"""
 input UserInput {
   name: String
@@ -118,6 +131,7 @@ input UserInput {
   verifiedEmail: Boolean
   role: RolePointerInput
   sessions: _SessionRelationInput
+  secondFA: UserSecondFAInput
 }
 
 input UserACLObjectInput {
@@ -142,6 +156,7 @@ input UserAuthenticationInput {
   emailPassword: UserAuthenticationEmailPasswordInput
   google: UserAuthenticationGoogleInput
   github: UserAuthenticationGithubInput
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPInput
 }
 
 input UserAuthenticationPhonePasswordInput {
@@ -165,6 +180,17 @@ input UserAuthenticationGithubInput {
   username: String!
 }
 
+input UserAuthenticationEmailPasswordSRPInput {
+  salt: String!
+  verifier: String!
+  serverSecret: String
+}
+
+input UserSecondFAInput {
+  enabled: Boolean!
+  provider: SecondaryFactor!
+}
+
 """Input to link an object to a pointer User"""
 input UserPointerInput {
   unlink: Boolean
@@ -187,6 +213,7 @@ input UserCreateFieldsInput {
   verifiedEmail: Boolean
   role: RolePointerInput
   sessions: _SessionRelationInput
+  secondFA: UserSecondFACreateFieldsInput
 }
 
 input UserACLObjectCreateFieldsInput {
@@ -211,6 +238,7 @@ input UserAuthenticationCreateFieldsInput {
   emailPassword: UserAuthenticationEmailPasswordCreateFieldsInput
   google: UserAuthenticationGoogleCreateFieldsInput
   github: UserAuthenticationGithubCreateFieldsInput
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPCreateFieldsInput
 }
 
 input UserAuthenticationPhonePasswordCreateFieldsInput {
@@ -234,6 +262,17 @@ input UserAuthenticationGithubCreateFieldsInput {
   username: String
 }
 
+input UserAuthenticationEmailPasswordSRPCreateFieldsInput {
+  salt: String
+  verifier: String
+  serverSecret: String
+}
+
+input UserSecondFACreateFieldsInput {
+  enabled: Boolean
+  provider: SecondaryFactor
+}
+
 """Input to add a relation to the class User"""
 input UserRelationInput {
   add: [ID!]
@@ -703,6 +742,7 @@ input UserWhereInput {
   verifiedEmail: BooleanWhereInput
   role: RoleWhereInput
   sessions: _SessionWhereInput
+  secondFA: UserSecondFAWhereInput
   OR: [UserWhereInput]
   AND: [UserWhereInput]
 }
@@ -792,6 +832,7 @@ input UserAuthenticationWhereInput {
   emailPassword: UserAuthenticationEmailPasswordWhereInput
   google: UserAuthenticationGoogleWhereInput
   github: UserAuthenticationGithubWhereInput
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPWhereInput
   OR: [UserAuthenticationWhereInput]
   AND: [UserAuthenticationWhereInput]
 }
@@ -832,6 +873,14 @@ input UserAuthenticationGithubWhereInput {
   AND: [UserAuthenticationGithubWhereInput]
 }
 
+input UserAuthenticationEmailPasswordSRPWhereInput {
+  salt: StringWhereInput
+  verifier: StringWhereInput
+  serverSecret: StringWhereInput
+  OR: [UserAuthenticationEmailPasswordSRPWhereInput]
+  AND: [UserAuthenticationEmailPasswordSRPWhereInput]
+}
+
 input AnyWhereInput {
   equalTo: Any
   notEqualTo: Any
@@ -915,6 +964,13 @@ input _SessionACLObjectRolesACLWhereInput {
   AND: [_SessionACLObjectRolesACLWhereInput]
 }
 
+input UserSecondFAWhereInput {
+  enabled: BooleanWhereInput
+  provider: AnyWhereInput
+  OR: [UserSecondFAWhereInput]
+  AND: [UserSecondFAWhereInput]
+}
+
 enum UserOrder {
   name_ASC
   name_DESC
@@ -942,6 +998,8 @@ enum UserOrder {
   role_DESC
   sessions_ASC
   sessions_DESC
+  secondFA_ASC
+  secondFA_DESC
 }
 
 type PostConnection {
@@ -1186,6 +1244,15 @@ type Mutation {
   customMutation(input: CustomMutationInput!): Int
   secondCustomMutation(input: SecondCustomMutationInput!): Int
 
+  """Sign up with SRP authentication method"""
+  signUpWithSRP(input: SignUpWithSRPInput!): Boolean
+
+  """Sign in with SRP authentication method"""
+  signInWithSRP(input: SignInWithSRPInput!): SignInWithSRPOutput
+
+  """Process the server session proof"""
+  processSRPChallenge(input: ProcessSRPChallengeInput!): ProcessSRPChallengeOutput
+
   """Mutation to reset the password of the user"""
   resetPassword(input: ResetPasswordInput!): Boolean
 
@@ -1198,7 +1265,7 @@ type Mutation {
   signUpWith(input: SignUpWithInput!): SignUpWithOutput
   signOut: Boolean
   refresh(input: RefreshInput!): RefreshSessionOutput
-  verifyChallenge(input: VerifyChallengeInput!): Boolean
+  verifyChallenge(input: VerifyChallengeInput!): VerifyChallengeOutput
 }
 
 type CreateUserPayload {
@@ -1242,6 +1309,7 @@ input UserUpdateFieldsInput {
   verifiedEmail: Boolean
   role: RolePointerInput
   sessions: _SessionRelationInput
+  secondFA: UserSecondFAUpdateFieldsInput
 }
 
 input UserACLObjectUpdateFieldsInput {
@@ -1266,6 +1334,7 @@ input UserAuthenticationUpdateFieldsInput {
   emailPassword: UserAuthenticationEmailPasswordUpdateFieldsInput
   google: UserAuthenticationGoogleUpdateFieldsInput
   github: UserAuthenticationGithubUpdateFieldsInput
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPUpdateFieldsInput
 }
 
 input UserAuthenticationPhonePasswordUpdateFieldsInput {
@@ -1289,6 +1358,17 @@ input UserAuthenticationGithubUpdateFieldsInput {
   username: String
 }
 
+input UserAuthenticationEmailPasswordSRPUpdateFieldsInput {
+  salt: String
+  verifier: String
+  serverSecret: String
+}
+
+input UserSecondFAUpdateFieldsInput {
+  enabled: Boolean
+  provider: SecondaryFactor
+}
+
 input UpdateUsersInput {
   fields: UserUpdateFieldsInput
   where: UserWhereInput
@@ -1640,11 +1720,37 @@ input SecondCustomMutationSumInput {
   b: Int!
 }
 
+input SignUpWithSRPInput {
+  email: Email!
+  salt: String!
+  verifier: String!
+}
+
+type SignInWithSRPOutput {
+  salt: String!
+  serverPublic: String!
+}
+
+input SignInWithSRPInput {
+  email: Email!
+  clientPublic: String!
+}
+
+type ProcessSRPChallengeOutput {
+  serverSessionProof: String!
+}
+
+input ProcessSRPChallengeInput {
+  email: Email!
+  clientPublic: String!
+  clientSessionProof: String!
+}
+
 input ResetPasswordInput {
   password: String!
-  email: Email!
+  email: Email
+  phone: String
   otp: String!
-  provider: AuthenticationProvider!
 }
 
 input SendOtpCodeInput {
@@ -1674,8 +1780,6 @@ input SignInWithAuthenticationInput {
   emailPassword: SignInWithAuthenticationEmailPasswordInput
   google: SignInWithAuthenticationGoogleInput
   github: SignInWithAuthenticationGithubInput
-  otp: SignInWithAuthenticationOtpInput
-  secondaryFactor: SecondaryFactor
 }
 
 input SignInWithAuthenticationPhonePasswordInput {
@@ -1698,10 +1802,6 @@ input SignInWithAuthenticationGithubInput {
   codeVerifier: String!
 }
 
-input SignInWithAuthenticationOtpInput {
-  code: String
-}
-
 type SignUpWithOutput {
   id: String
   accessToken: String!
@@ -1717,8 +1817,6 @@ input SignUpWithAuthenticationInput {
   emailPassword: SignUpWithAuthenticationEmailPasswordInput
   google: SignUpWithAuthenticationGoogleInput
   github: SignUpWithAuthenticationGithubInput
-  otp: SignUpWithAuthenticationOtpInput
-  secondaryFactor: SecondaryFactor
 }
 
 input SignUpWithAuthenticationPhonePasswordInput {
@@ -1741,10 +1839,6 @@ input SignUpWithAuthenticationGithubInput {
   codeVerifier: String!
 }
 
-input SignUpWithAuthenticationOtpInput {
-  code: String
-}
-
 type RefreshSessionOutput {
   accessToken: String!
   refreshToken: String!
@@ -1755,14 +1849,25 @@ input RefreshInput {
   refreshToken: String!
 }
 
+type VerifyChallengeOutput {
+  accessToken: String
+}
+
 input VerifyChallengeInput {
-  factor: VerifyChallengeFactorInput
+  secondFA: VerifyChallengeSecondaryFactorAuthenticationInput
+}
+
+input VerifyChallengeSecondaryFactorAuthenticationInput {
+  emailOTP: VerifyChallengeSecondaryFactorAuthenticationEmailOTPInput
+  EmailOTp: VerifyChallengeSecondaryFactorAuthenticationEmailOTpInput
 }
 
-input VerifyChallengeFactorInput {
-  otp: VerifyChallengeFactorOtpInput
+input VerifyChallengeSecondaryFactorAuthenticationEmailOTPInput {
+  email: Email!
+  otp: String!
 }
 
-input VerifyChallengeFactorOtpInput {
-  code: String
+input VerifyChallengeSecondaryFactorAuthenticationEmailOTpInput {
+  email: Email!
+  code: String!
 }

package/generated/wabe.ts

@@ -11,7 +11,7 @@ export enum AuthenticationProvider {
 }
 
 export enum SecondaryFactor {
-	EmailOTP = "emailOTP"
+	emailOTP = "emailOTP"
 }
 
 export type ACLObjectUsersACL = {
@@ -40,7 +40,8 @@ export type Authentication = {
 	phonePassword?: AuthenticationPhonePassword,
 	emailPassword?: AuthenticationEmailPassword,
 	google?: AuthenticationGoogle,
-	github?: AuthenticationGithub
+	github?: AuthenticationGithub,
+	emailPasswordSRP?: AuthenticationEmailPasswordSRP
 }
 
 export type AuthenticationEmailPassword = {
@@ -59,6 +60,17 @@ export type AuthenticationGithub = {
 	username: string
 }
 
+export type AuthenticationEmailPasswordSRP = {
+	salt: string,
+	verifier: string,
+	serverSecret?: string
+}
+
+export type SecondFA = {
+	enabled: boolean,
+	provider: SecondaryFactor
+}
+
 export type User = {
 	id: string,
 	name?: string,
@@ -73,7 +85,8 @@ export type User = {
 	isOauth?: boolean,
 	verifiedEmail?: boolean,
 	role?: Role,
-	sessions?: Array<_Session>
+	sessions?: Array<_Session>,
+	secondFA?: SecondFA
 }
 
 export type Experience = {
@@ -131,6 +144,71 @@ export type _InternalConfig = {
 	search?: Array<string>
 }
 
+export type WhereUser = {
+	id: string,
+	name?: string,
+	age?: number,
+	email?: string,
+	acl?: ACLObject,
+	createdAt?: Date,
+	updatedAt?: Date,
+	search?: Array<string>,
+	authentication?: Authentication,
+	provider?: AuthenticationProvider,
+	isOauth?: boolean,
+	verifiedEmail?: boolean,
+	role?: Role,
+	sessions?: Array<_Session>,
+	secondFA?: SecondFA
+}
+
+export type WherePost = {
+	id: string,
+	name: string,
+	test2?: RoleEnum,
+	test3: Array<User>,
+	test4: User,
+	experiences?: Array<Experience>,
+	acl?: ACLObject,
+	createdAt?: Date,
+	updatedAt?: Date,
+	search?: Array<string>
+}
+
+export type Where_Session = {
+	id: string,
+	user: User,
+	accessToken: string,
+	accessTokenExpiresAt: Date,
+	refreshToken?: string,
+	refreshTokenExpiresAt: Date,
+	acl?: ACLObject,
+	createdAt?: Date,
+	updatedAt?: Date,
+	search?: Array<string>
+}
+
+export type WhereRole = {
+	id: string,
+	name: string,
+	users?: Array<User>,
+	acl?: ACLObject,
+	createdAt?: Date,
+	updatedAt?: Date,
+	search?: Array<string>
+}
+
+export type Where_InternalConfig = {
+	id: string,
+	configKey: string,
+	configValue: string,
+	description?: string,
+	acl?: ACLObject,
+	createdAt?: Date,
+	updatedAt?: Date,
+	search?: Array<string>
+}
+
 export type CreateMutationInput = {
 	name: number
 }
@@ -161,11 +239,40 @@ export type SecondCustomMutationSum = {
 	b: number
 }
 
+export type SignUpWithSRPInput = {
+	email: string,
+	salt: string,
+	verifier: string
+}
+
+export type MutationSignUpWithSRPArgs = {
+	input: SignUpWithSRPInput
+}
+
+export type SignInWithSRPInput = {
+	email: string,
+	clientPublic: string
+}
+
+export type MutationSignInWithSRPArgs = {
+	input: SignInWithSRPInput
+}
+
+export type ProcessSRPChallengeInput = {
+	email: string,
+	clientPublic: string,
+	clientSessionProof: string
+}
+
+export type MutationProcessSRPChallengeArgs = {
+	input: ProcessSRPChallengeInput
+}
+
 export type ResetPasswordInput = {
 	password: string,
-	email: string,
-	otp: string,
-	provider: AuthenticationProvider
+	email?: string,
+	phone?: string,
+	otp: string
 }
 
 export type MutationResetPasswordArgs = {
@@ -209,9 +316,7 @@ export type SignInWithAuthentication = {
 	phonePassword?: SignInWithAuthenticationPhonePassword,
 	emailPassword?: SignInWithAuthenticationEmailPassword,
 	google?: SignInWithAuthenticationGoogle,
-	github?: SignInWithAuthenticationGithub,
-	otp?: SignInWithAuthenticationOtp,
-	secondaryFactor?: SecondaryFactor
+	github?: SignInWithAuthenticationGithub
 }
 
 export type SignInWithAuthenticationEmailPassword = {
@@ -229,10 +334,6 @@ export type SignInWithAuthenticationGithub = {
 	codeVerifier: string
 }
 
-export type SignInWithAuthenticationOtp = {
-	code?: string
-}
-
 export type SignUpWithInput = {
 	authentication: SignUpWithAuthentication
 }
@@ -250,9 +351,7 @@ export type SignUpWithAuthentication = {
 	phonePassword?: SignUpWithAuthenticationPhonePassword,
 	emailPassword?: SignUpWithAuthenticationEmailPassword,
 	google?: SignUpWithAuthenticationGoogle,
-	github?: SignUpWithAuthenticationGithub,
-	otp?: SignUpWithAuthenticationOtp,
-	secondaryFactor?: SecondaryFactor
+	github?: SignUpWithAuthenticationGithub
 }
 
 export type SignUpWithAuthenticationEmailPassword = {
@@ -270,10 +369,6 @@ export type SignUpWithAuthenticationGithub = {
 	codeVerifier: string
 }
 
-export type SignUpWithAuthenticationOtp = {
-	code?: string
-}
-
 export type SignOutInput = {
 
 }
@@ -292,19 +387,26 @@ export type MutationRefreshArgs = {
 }
 
 export type VerifyChallengeInput = {
-	factor?: VerifyChallengeFactor
+	secondFA?: VerifyChallengeSecondFA
 }
 
 export type MutationVerifyChallengeArgs = {
 	input: VerifyChallengeInput
 }
 
-export type VerifyChallengeFactorOtp = {
-	code?: string
+export type VerifyChallengeSecondFAEmailOTP = {
+	email: string,
+	otp: string
 }
 
-export type VerifyChallengeFactor = {
-	otp?: VerifyChallengeFactorOtp
+export type VerifyChallengeSecondFA = {
+	emailOTP?: VerifyChallengeSecondFAEmailOTP,
+	EmailOTp?: VerifyChallengeSecondFAEmailOTp
+}
+
+export type VerifyChallengeSecondFAEmailOTp = {
+	email: string,
+	code: string
 }
 
 export type QueryHelloWorldArgs = {
@@ -329,4 +431,12 @@ export type WabeSchemaTypes = {
 	_Session: _Session,
 	Role: Role,
 	_InternalConfig: _InternalConfig
+}
+
+export type WabeSchemaWhereTypes = {
+	User: WhereUser,
+	Post: WherePost,
+	_Session: Where_Session,
+	Role: WhereRole,
+	_InternalConfig: Where_InternalConfig
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wabe",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Your backend in minutes not days",
   "homepage": "https://wabe.dev",
   "author": {
@@ -20,8 +20,7 @@
   },
   "main": "dist/index.js",
   "scripts": {
-    "build": "bun generate:codegen && bun build $(pwd)/src/index.ts --outdir dist/ --target=node --external=@node-rs/argon2 && bun generate:types",
-    "generate:types": "dts-bundle-generator -o dist/index.d.ts src/index.ts --no-check --external-imports=wobe",
+    "build": "bun --filter wabe-build build:package $(pwd)",
     "check": "tsc --project $(pwd)/tsconfig.json",
     "lint": "biome lint . --no-errors-on-unmatched --config-path=../../",
     "ci": "bun generate:codegen && bun lint $(pwd) && bun check && bun test src",
@@ -31,10 +30,12 @@
   },
   "dependencies": {
     "@graphql-yoga/plugin-disable-introspection": "2.10.9",
-    "@node-rs/argon2": "2.0.0",
+    "@node-rs/argon2": "2.0.2",
+    "croner": "9.0.0",
+    "js-srp6a": "1.0.2",
     "jsonwebtoken": "9.0.2",
     "libphonenumber-js": "1.11.18",
-    "mongodb": "6.8.0",
+    "mongodb": "6.13.1",
     "otplib": "12.0.1",
     "p-retry": "6.2.1",
     "wobe": "1.1.10",
@@ -45,11 +46,11 @@
     "@types/bun": "latest",
     "@types/jsonwebtoken": "9.0.6",
     "@types/uuid": "9.0.6",
-    "dts-bundle-generator": "9.5.1",
     "get-port": "7.1.0",
     "graphql-request": "6.1.0",
     "uuid": "10.0.0",
     "wabe-mongodb-launcher": "workspace:*",
-    "wabe-pluralize": "workspace:*"
+    "wabe-pluralize": "workspace:*",
+    "wabe-build": "workspace:*"
   }
 }