wabe 0.6.7 → 0.6.9

package/generated/schema.graphql

@@ -1,4 +1,5 @@
 enum RoleEnum {
+  DashboardAdmin
   Admin
   Client
 }
@@ -12,6 +13,7 @@ enum AuthenticationProvider {
 
 enum SecondaryFactor {
   emailOTP
+  qrcodeOTP
 }
 
 """Object containing information about the file"""
@@ -65,11 +67,18 @@ type UserACLObjectRolesACL {
 }
 
 type UserAuthentication {
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRP
   phonePassword: UserAuthenticationPhonePassword
   emailPassword: UserAuthenticationEmailPassword
   google: UserAuthenticationGoogle
   github: UserAuthenticationGithub
-  emailPasswordSRP: UserAuthenticationEmailPasswordSRP
+}
+
+type UserAuthenticationEmailPasswordSRP {
+  email: Email!
+  salt: String!
+  verifier: String!
+  serverSecret: String
 }
 
 type UserAuthenticationPhonePassword {
@@ -96,13 +105,8 @@ type UserAuthenticationGithub {
   username: String!
 }
 
-type UserAuthenticationEmailPasswordSRP {
-  salt: String!
-  verifier: String!
-  serverSecret: String
-}
-
 type _SessionConnection {
+  ok: Boolean
   totalCount: Int
   edges: [_SessionEdge]
 }
@@ -152,11 +156,18 @@ input UserACLObjectRolesACLInput {
 }
 
 input UserAuthenticationInput {
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPInput
   phonePassword: UserAuthenticationPhonePasswordInput
   emailPassword: UserAuthenticationEmailPasswordInput
   google: UserAuthenticationGoogleInput
   github: UserAuthenticationGithubInput
-  emailPasswordSRP: UserAuthenticationEmailPasswordSRPInput
+}
+
+input UserAuthenticationEmailPasswordSRPInput {
+  email: Email!
+  salt: String!
+  verifier: String!
+  serverSecret: String
 }
 
 input UserAuthenticationPhonePasswordInput {
@@ -180,12 +191,6 @@ input UserAuthenticationGithubInput {
   username: String!
 }
 
-input UserAuthenticationEmailPasswordSRPInput {
-  salt: String!
-  verifier: String!
-  serverSecret: String
-}
-
 input UserSecondFAInput {
   enabled: Boolean!
   provider: SecondaryFactor!
@@ -234,11 +239,18 @@ input UserACLObjectRolesACLCreateFieldsInput {
 }
 
 input UserAuthenticationCreateFieldsInput {
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPCreateFieldsInput
   phonePassword: UserAuthenticationPhonePasswordCreateFieldsInput
   emailPassword: UserAuthenticationEmailPasswordCreateFieldsInput
   google: UserAuthenticationGoogleCreateFieldsInput
   github: UserAuthenticationGithubCreateFieldsInput
-  emailPasswordSRP: UserAuthenticationEmailPasswordSRPCreateFieldsInput
+}
+
+input UserAuthenticationEmailPasswordSRPCreateFieldsInput {
+  email: Email
+  salt: String
+  verifier: String
+  serverSecret: String
 }
 
 input UserAuthenticationPhonePasswordCreateFieldsInput {
@@ -262,12 +274,6 @@ input UserAuthenticationGithubCreateFieldsInput {
   username: String
 }
 
-input UserAuthenticationEmailPasswordSRPCreateFieldsInput {
-  salt: String
-  verifier: String
-  serverSecret: String
-}
-
 input UserSecondFACreateFieldsInput {
   enabled: Boolean
   provider: SecondaryFactor
@@ -294,6 +300,7 @@ type Post {
 }
 
 type UserConnection {
+  ok: Boolean
   totalCount: Int
   edges: [UserEdge]
 }
@@ -828,15 +835,24 @@ input SearchWhereInput {
 scalar Search
 
 input UserAuthenticationWhereInput {
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPWhereInput
   phonePassword: UserAuthenticationPhonePasswordWhereInput
   emailPassword: UserAuthenticationEmailPasswordWhereInput
   google: UserAuthenticationGoogleWhereInput
   github: UserAuthenticationGithubWhereInput
-  emailPasswordSRP: UserAuthenticationEmailPasswordSRPWhereInput
   OR: [UserAuthenticationWhereInput]
   AND: [UserAuthenticationWhereInput]
 }
 
+input UserAuthenticationEmailPasswordSRPWhereInput {
+  email: EmailWhereInput
+  salt: StringWhereInput
+  verifier: StringWhereInput
+  serverSecret: StringWhereInput
+  OR: [UserAuthenticationEmailPasswordSRPWhereInput]
+  AND: [UserAuthenticationEmailPasswordSRPWhereInput]
+}
+
 input UserAuthenticationPhonePasswordWhereInput {
   phone: PhoneWhereInput
   password: StringWhereInput
@@ -873,14 +889,6 @@ input UserAuthenticationGithubWhereInput {
   AND: [UserAuthenticationGithubWhereInput]
 }
 
-input UserAuthenticationEmailPasswordSRPWhereInput {
-  salt: StringWhereInput
-  verifier: StringWhereInput
-  serverSecret: StringWhereInput
-  OR: [UserAuthenticationEmailPasswordSRPWhereInput]
-  AND: [UserAuthenticationEmailPasswordSRPWhereInput]
-}
-
 input AnyWhereInput {
   equalTo: Any
   notEqualTo: Any
@@ -1003,6 +1011,7 @@ enum UserOrder {
 }
 
 type PostConnection {
+  ok: Boolean
   totalCount: Int
   edges: [PostEdge]
 }
@@ -1109,6 +1118,7 @@ enum _SessionOrder {
 }
 
 type RoleConnection {
+  ok: Boolean
   totalCount: Int
   edges: [RoleEdge]
 }
@@ -1133,6 +1143,7 @@ enum RoleOrder {
 }
 
 type _InternalConfigConnection {
+  ok: Boolean
   totalCount: Int
   edges: [_InternalConfigEdge]
 }
@@ -1244,15 +1255,6 @@ 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
 
@@ -1330,11 +1332,18 @@ input UserACLObjectRolesACLUpdateFieldsInput {
 }
 
 input UserAuthenticationUpdateFieldsInput {
+  emailPasswordSRP: UserAuthenticationEmailPasswordSRPUpdateFieldsInput
   phonePassword: UserAuthenticationPhonePasswordUpdateFieldsInput
   emailPassword: UserAuthenticationEmailPasswordUpdateFieldsInput
   google: UserAuthenticationGoogleUpdateFieldsInput
   github: UserAuthenticationGithubUpdateFieldsInput
-  emailPasswordSRP: UserAuthenticationEmailPasswordSRPUpdateFieldsInput
+}
+
+input UserAuthenticationEmailPasswordSRPUpdateFieldsInput {
+  email: Email
+  salt: String
+  verifier: String
+  serverSecret: String
 }
 
 input UserAuthenticationPhonePasswordUpdateFieldsInput {
@@ -1358,12 +1367,6 @@ input UserAuthenticationGithubUpdateFieldsInput {
   username: String
 }
 
-input UserAuthenticationEmailPasswordSRPUpdateFieldsInput {
-  salt: String
-  verifier: String
-  serverSecret: String
-}
-
 input UserSecondFAUpdateFieldsInput {
   enabled: Boolean
   provider: SecondaryFactor
@@ -1720,32 +1723,6 @@ 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
@@ -1766,9 +1743,15 @@ input SendEmailInput {
 }
 
 type SignInWithOutput {
-  id: String
+  user: User
   accessToken: String
   refreshToken: String
+  srp: SignInWithOutputSRPOutputSignInWith
+}
+
+type SignInWithOutputSRPOutputSignInWith {
+  salt: String
+  serverPublic: String
 }
 
 input SignInWithInput {
@@ -1776,12 +1759,20 @@ input SignInWithInput {
 }
 
 input SignInWithAuthenticationInput {
+  emailPasswordSRP: SignInWithAuthenticationEmailPasswordSRPInput
   phonePassword: SignInWithAuthenticationPhonePasswordInput
   emailPassword: SignInWithAuthenticationEmailPasswordInput
   google: SignInWithAuthenticationGoogleInput
   github: SignInWithAuthenticationGithubInput
 }
 
+input SignInWithAuthenticationEmailPasswordSRPInput {
+  email: Email!
+  clientPublic: String
+  salt: String
+  verifier: String
+}
+
 input SignInWithAuthenticationPhonePasswordInput {
   phone: Phone!
   password: String!
@@ -1813,12 +1804,20 @@ input SignUpWithInput {
 }
 
 input SignUpWithAuthenticationInput {
+  emailPasswordSRP: SignUpWithAuthenticationEmailPasswordSRPInput
   phonePassword: SignUpWithAuthenticationPhonePasswordInput
   emailPassword: SignUpWithAuthenticationEmailPasswordInput
   google: SignUpWithAuthenticationGoogleInput
   github: SignUpWithAuthenticationGithubInput
 }
 
+input SignUpWithAuthenticationEmailPasswordSRPInput {
+  email: Email!
+  clientPublic: String
+  salt: String
+  verifier: String
+}
+
 input SignUpWithAuthenticationPhonePasswordInput {
   phone: Phone!
   password: String!
@@ -1851,6 +1850,11 @@ input RefreshInput {
 
 type VerifyChallengeOutput {
   accessToken: String
+  srp: VerifyChallengeOutputSRPOutputVerifyChallenge
+}
+
+type VerifyChallengeOutputSRPOutputVerifyChallenge {
+  serverSessionProof: String!
 }
 
 input VerifyChallengeInput {
@@ -1858,8 +1862,15 @@ input VerifyChallengeInput {
 }
 
 input VerifyChallengeSecondaryFactorAuthenticationInput {
+  emailPasswordSRPChallenge: VerifyChallengeSecondaryFactorAuthenticationEmailPasswordSRPChallengeInput
   emailOTP: VerifyChallengeSecondaryFactorAuthenticationEmailOTPInput
-  EmailOTp: VerifyChallengeSecondaryFactorAuthenticationEmailOTpInput
+  qrCodeOTP: VerifyChallengeSecondaryFactorAuthenticationQrCodeOTPInput
+}
+
+input VerifyChallengeSecondaryFactorAuthenticationEmailPasswordSRPChallengeInput {
+  email: Email!
+  clientPublic: String!
+  clientSessionProof: String!
 }
 
 input VerifyChallengeSecondaryFactorAuthenticationEmailOTPInput {
@@ -1867,7 +1878,7 @@ input VerifyChallengeSecondaryFactorAuthenticationEmailOTPInput {
   otp: String!
 }
 
-input VerifyChallengeSecondaryFactorAuthenticationEmailOTpInput {
+input VerifyChallengeSecondaryFactorAuthenticationQrCodeOTPInput {
   email: Email!
-  code: String!
+  otp: String!
 }

package/generated/wabe.ts

@@ -1,4 +1,5 @@
 export enum RoleEnum {
+	DashboardAdmin = "DashboardAdmin",
 	Admin = "Admin",
 	Client = "Client"
 }
@@ -11,7 +12,8 @@ export enum AuthenticationProvider {
 }
 
 export enum SecondaryFactor {
-	emailOTP = "emailOTP"
+	emailOTP = "emailOTP",
+	qrcodeOTP = "qrcodeOTP"
 }
 
 export type ACLObjectUsersACL = {
@@ -31,17 +33,24 @@ export type ACLObjectRolesACL = {
 	write: boolean
 }
 
-export type AuthenticationPhonePassword = {
-	phone: string,
-	password: string
+export type AuthenticationEmailPasswordSRP = {
+	email: string,
+	salt: string,
+	verifier: string,
+	serverSecret?: string
 }
 
 export type Authentication = {
+	emailPasswordSRP?: AuthenticationEmailPasswordSRP,
 	phonePassword?: AuthenticationPhonePassword,
 	emailPassword?: AuthenticationEmailPassword,
 	google?: AuthenticationGoogle,
-	github?: AuthenticationGithub,
-	emailPasswordSRP?: AuthenticationEmailPasswordSRP
+	github?: AuthenticationGithub
+}
+
+export type AuthenticationPhonePassword = {
+	phone: string,
+	password: string
 }
 
 export type AuthenticationEmailPassword = {
@@ -60,12 +69,6 @@ export type AuthenticationGithub = {
 	username: string
 }
 
-export type AuthenticationEmailPasswordSRP = {
-	salt: string,
-	verifier: string,
-	serverSecret?: string
-}
-
 export type SecondFA = {
 	enabled: boolean,
 	provider: SecondaryFactor
@@ -239,35 +242,6 @@ 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,
@@ -307,18 +281,26 @@ export type MutationSignInWithArgs = {
 	input: SignInWithInput
 }
 
-export type SignInWithAuthenticationPhonePassword = {
-	phone: string,
-	password: string
+export type SignInWithAuthenticationEmailPasswordSRP = {
+	email: string,
+	clientPublic?: string,
+	salt?: string,
+	verifier?: string
 }
 
 export type SignInWithAuthentication = {
+	emailPasswordSRP?: SignInWithAuthenticationEmailPasswordSRP,
 	phonePassword?: SignInWithAuthenticationPhonePassword,
 	emailPassword?: SignInWithAuthenticationEmailPassword,
 	google?: SignInWithAuthenticationGoogle,
 	github?: SignInWithAuthenticationGithub
 }
 
+export type SignInWithAuthenticationPhonePassword = {
+	phone: string,
+	password: string
+}
+
 export type SignInWithAuthenticationEmailPassword = {
 	email: string,
 	password: string
@@ -342,18 +324,26 @@ export type MutationSignUpWithArgs = {
 	input: SignUpWithInput
 }
 
-export type SignUpWithAuthenticationPhonePassword = {
-	phone: string,
-	password: string
+export type SignUpWithAuthenticationEmailPasswordSRP = {
+	email: string,
+	clientPublic?: string,
+	salt?: string,
+	verifier?: string
 }
 
 export type SignUpWithAuthentication = {
+	emailPasswordSRP?: SignUpWithAuthenticationEmailPasswordSRP,
 	phonePassword?: SignUpWithAuthenticationPhonePassword,
 	emailPassword?: SignUpWithAuthenticationEmailPassword,
 	google?: SignUpWithAuthenticationGoogle,
 	github?: SignUpWithAuthenticationGithub
 }
 
+export type SignUpWithAuthenticationPhonePassword = {
+	phone: string,
+	password: string
+}
+
 export type SignUpWithAuthenticationEmailPassword = {
 	email: string,
 	password: string
@@ -394,19 +384,26 @@ export type MutationVerifyChallengeArgs = {
 	input: VerifyChallengeInput
 }
 
-export type VerifyChallengeSecondFAEmailOTP = {
+export type VerifyChallengeSecondFAEmailPasswordSRPChallenge = {
 	email: string,
-	otp: string
+	clientPublic: string,
+	clientSessionProof: string
 }
 
 export type VerifyChallengeSecondFA = {
+	emailPasswordSRPChallenge?: VerifyChallengeSecondFAEmailPasswordSRPChallenge,
 	emailOTP?: VerifyChallengeSecondFAEmailOTP,
-	EmailOTp?: VerifyChallengeSecondFAEmailOTp
+	qrCodeOTP?: VerifyChallengeSecondFAQrCodeOTP
+}
+
+export type VerifyChallengeSecondFAEmailOTP = {
+	email: string,
+	otp: string
 }
 
-export type VerifyChallengeSecondFAEmailOTp = {
+export type VerifyChallengeSecondFAQrCodeOTP = {
 	email: string,
-	code: string
+	otp: string
 }
 
 export type QueryHelloWorldArgs = {

package/package.json

@@ -1,56 +1,54 @@
 {
-  "name": "wabe",
-  "version": "0.6.7",
-  "description": "Your backend in minutes not days",
-  "homepage": "https://wabe.dev",
-  "author": {
-    "name": "coratgerl",
-    "url": "https://github.com/coratgerl"
-  },
-  "license": "Apache-2.0",
-  "keywords": [
-    "backend",
-    "wabe",
-    "graphql",
-    "baas"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/palixir/wabe.git"
-  },
-  "main": "dist/index.js",
-  "scripts": {
-    "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",
-    "format": "biome format --write . --config-path=../../",
-    "dev": "bun run --watch dev/index.ts",
-    "generate:codegen": "touch generated/wabe.ts && CODEGEN=true bun dev/index.ts"
-  },
-  "dependencies": {
-    "@graphql-yoga/plugin-disable-introspection": "2.10.9",
-    "@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.13.1",
-    "otplib": "12.0.1",
-    "p-retry": "6.2.1",
-    "wobe": "1.1.10",
-    "wobe-graphql-yoga": "1.2.6"
-  },
-  "devDependencies": {
-    "@parcel/watcher": "2.3.0",
-    "@types/bun": "latest",
-    "@types/jsonwebtoken": "9.0.6",
-    "@types/uuid": "9.0.6",
-    "get-port": "7.1.0",
-    "graphql-request": "6.1.0",
-    "uuid": "10.0.0",
-    "wabe-mongodb-launcher": "workspace:*",
-    "wabe-pluralize": "workspace:*",
-    "wabe-build": "workspace:*"
-  }
+	"name": "wabe",
+	"version": "0.6.9",
+	"description": "Your backend in minutes not days",
+	"homepage": "https://wabe.dev",
+	"author": {
+		"name": "coratgerl",
+		"url": "https://github.com/coratgerl"
+	},
+	"license": "Apache-2.0",
+	"keywords": [
+		"backend",
+		"wabe",
+		"graphql",
+		"baas"
+	],
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/palixir/wabe.git"
+	},
+	"main": "dist/index.js",
+	"scripts": {
+		"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",
+		"format": "biome format --write . --config-path=../../",
+		"dev": "bun run --watch dev/index.ts",
+		"generate:codegen": "touch generated/wabe.ts && CODEGEN=true bun dev/index.ts"
+	},
+	"dependencies": {
+		"@graphql-yoga/plugin-disable-introspection": "2.10.9",
+		"croner": "9.0.0",
+		"js-srp6a": "1.0.2",
+		"jsonwebtoken": "9.0.2",
+		"libphonenumber-js": "1.11.18",
+		"otplib": "12.0.1",
+		"p-retry": "6.2.1",
+		"wobe": "1.1.10",
+		"wobe-graphql-yoga": "1.2.6"
+	},
+	"devDependencies": {
+		"@types/jsonwebtoken": "9.0.6",
+		"@types/uuid": "9.0.6",
+		"graphql-request": "6.1.0",
+		"get-port": "7.1.0",
+		"uuid": "10.0.0",
+		"wabe-mongodb-launcher": "workspace:*",
+		"wabe-pluralize": "workspace:*",
+		"wabe-build": "workspace:*",
+		"wabe-mongodb": "workspace:*",
+		"wabe": "workspace:*"
+	}
 }

package/dist/authentication/srp/processSRPChallenge.d.ts

@@ -1 +0,0 @@
-export declare const processSRPChallenge: unknown;

package/dist/authentication/srp/signInWithSRP.d.ts

@@ -1 +0,0 @@
-export declare const signInWithSRP: unknown;

package/dist/authentication/srp/signUpWithSRP.d.ts

@@ -1 +0,0 @@
-export declare const signUpWithSRP: unknown;