fix: make phone optional during enrollment (#59)

DefGuard · Mar 21, 2024 · 7ef47a2 · 7ef47a2
1 parent d3e4651
commit 7ef47a2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/proto b/proto
diff --git a/web/src/pages/enrollment/steps/DataVerificationStep/DataVerificationStep.tsx b/web/src/pages/enrollment/steps/DataVerificationStep/DataVerificationStep.tsx
@@ -39,10 +39,12 @@ export const DataVerificationStep = () => {
     () =>
       z.object({
         phone: z
-          .string()
-          .trim()
-          .nonempty(LL.form.errors.required())
-          .regex(phonePattern, LL.form.errors.invalid()),
+          .union([
+            z.string().length(0),
+            z.string().trim().regex(phonePattern, LL.form.errors.invalid()),
+          ])
+          .optional()
+          .transform((e) => (e === '' ? undefined : e)),
       }),
     [LL.form.errors],
   );

diff --git a/web/src/pages/enrollment/steps/DeviceStep/DeviceStep.tsx b/web/src/pages/enrollment/steps/DeviceStep/DeviceStep.tsx
@@ -49,7 +49,7 @@ export const DeviceStep = () => {
   });
 
   useEffect(() => {
-    if (userPhone && userPassword) {
+    if (userPassword) {
       const sub = nextSubject.subscribe(() => {
         if ((deviceState && deviceState.device && deviceState.configs) || vpnOptional) {
           setStore({

diff --git a/web/src/shared/hooks/api/types.ts b/web/src/shared/hooks/api/types.ts
@@ -27,7 +27,7 @@ export type EnrollmentStartResponse = {
 };
 
 export type ActivateUserRequest = {
-  phone_number: string;
+  phone_number?: string;
   password: string;
 };
+1 −1		core/proxy.proto
+16 −6		wireguard/gateway.proto
+1 −1		worker/worker.proto