Merge branch 'master' into BA-2357-support-first-and-last-name

Author: sundayguru

packages/authentication/CHANGELOG.md

@@ -9,6 +9,18 @@
 - Updated form validation to ensure correct input for the revised registration fields.
 - If you're using `useSignUp` with name only, you should set `useNameField`  to `true` on the hook's option 
 
+## 4.1.9
+
+### Patch Changes
+
+- Add password validations to reset and change expired password
+
+## 4.1.8
+
+### Patch Changes
+
+- Fix image path handling for profile images
+
 ## 4.1.7
 
 ### Patch Changes

packages/authentication/modules/access/useChangeExpiredPassword/__tests__/useChangeExpiredPassword.test.tsx

@@ -11,7 +11,7 @@ import useChangeExpiredPassword from '../index'
 
 describe('useChangeExpiredPassword', () => {
   const currentPassword = '1234'
-  const password = '123456'
+  const password = '12345#Abcde'
   const token = 'fake-token'
   const changePasswordUrl = '/change-expired-password'
 

packages/authentication/modules/access/useChangeExpiredPassword/constants.ts

@@ -1,4 +1,4 @@
-import { ZOD_MESSAGE } from '@baseapp-frontend/utils'
+import { PASSWORD_REGEX, ZOD_MESSAGE } from '@baseapp-frontend/utils'
 
 import { z } from 'zod'
 
@@ -7,7 +7,9 @@ import type { ChangeExpiredPasswordForm } from './types'
 export const DEFAULT_VALIDATION_SCHEMA = z
   .object({
     currentPassword: z.string().nonempty(ZOD_MESSAGE.required),
-    newPassword: z.string().nonempty(ZOD_MESSAGE.required),
+    newPassword: z.string().min(1, ZOD_MESSAGE.required).regex(PASSWORD_REGEX, {
+      message: ZOD_MESSAGE.password,
+    }),
     confirmNewPassword: z.string().nonempty(ZOD_MESSAGE.required),
   })
   .refine(({ confirmNewPassword, newPassword }) => newPassword === confirmNewPassword, {

packages/authentication/modules/access/useLogin/index.ts

@@ -61,7 +61,12 @@ const useLogin = ({
       if (user) {
         // TODO: handle the absolute image path on the backend
         const baseUrl = process.env.NEXT_PUBLIC_API_BASE_URL?.replace('/v1', '')
-        const absoluteImagePath = user?.profile?.image ? `${baseUrl}${user.profile.image}` : null
+        let absoluteImagePath = null
+        if (user?.profile?.image) {
+          absoluteImagePath = user.profile.image.startsWith('http')
+            ? user.profile.image
+            : `${baseUrl}${user.profile.image}`
+        }
         setCurrentProfile({
           ...user.profile,
           image: absoluteImagePath,

packages/authentication/modules/access/useResetPassword/__tests__/useResetPassword.test.tsx

@@ -10,7 +10,7 @@ import { z } from 'zod'
 import useResetPassword from '../index'
 
 describe('useResetPassword', () => {
-  const password = '123456'
+  const password = '12345#Abcde'
   const token = 'fake-token'
   const resetPasswordUrl = '/forgot-password/reset'
 

packages/authentication/modules/access/useResetPassword/constants.ts

@@ -1,12 +1,14 @@
-import { ZOD_MESSAGE } from '@baseapp-frontend/utils'
+import { PASSWORD_REGEX, ZOD_MESSAGE } from '@baseapp-frontend/utils'
 
 import { z } from 'zod'
 
 import type { ResetPasswordForm } from './types'
 
 export const DEFAULT_VALIDATION_SCHEMA = z
   .object({
-    newPassword: z.string().nonempty(ZOD_MESSAGE.required),
+    newPassword: z.string().min(1, ZOD_MESSAGE.required).regex(PASSWORD_REGEX, {
+      message: ZOD_MESSAGE.password,
+    }),
     confirmNewPassword: z.string().nonempty(ZOD_MESSAGE.required),
   })
   .refine(({ confirmNewPassword, newPassword }) => newPassword === confirmNewPassword, {

packages/authentication/modules/access/useSignUp/__tests__/useSignUp.test.tsx

@@ -73,7 +73,7 @@ describe('useSignUp', () => {
               firstName: 'John',
               lastName: 'Doe',
               email: 'john.doe@example.com',
-              password: 'password',
+              password: '#F12W7q0jwv525',
             },
           },
           options: {

packages/components/.storybook/decorators/index.ts

@@ -1,2 +1,3 @@
 export { default as withTokenSetup } from './withTokenSetup'
 export { default as withProviders } from './withProviders'
+export { default as withMutationResolver } from './withMutationResolver'

packages/components/.storybook/decorators/withMutationResolver.tsx

@@ -0,0 +1,67 @@
+import React, { useEffect } from 'react'
+
+import { createTestEnvironment } from '@baseapp-frontend/graphql'
+
+import type { StoryContext, StoryFn } from '@storybook/react'
+import { Observable, OperationDescriptor } from 'relay-runtime'
+import { MockPayloadGenerator } from 'relay-test-utils'
+import { MockResolvers } from 'relay-test-utils/lib/RelayMockPayloadGenerator'
+
+export type DynamicMockResolvers = (operation: OperationDescriptor) => MockResolvers
+
+const withMutationResolver = (Story: StoryFn, context: StoryContext) => {
+  const { environment, queueOperationResolver } = context.parameters
+    .relayMockEnvironment as ReturnType<typeof createTestEnvironment>
+
+  const mockResolvers = context.parameters.mockResolvers || undefined
+  const dynamicMockResolvers: DynamicMockResolvers =
+    context.parameters.dynamicMockResolvers || undefined
+  const mutationError: string = context.parameters.mutationError || undefined
+
+  useEffect(() => {
+    const originalExecuteMutation = environment.executeMutation
+
+    environment.executeMutation = (request) => {
+      if (!mutationError) {
+        if (dynamicMockResolvers) {
+          environment.mock.queueOperationResolver(() => {
+            return MockPayloadGenerator.generate(
+              request.operation,
+              dynamicMockResolvers(request.operation),
+            )
+          })
+        } else if (mockResolvers) {
+          environment.mock.queueOperationResolver(() => {
+            return MockPayloadGenerator.generate(request.operation, mockResolvers)
+          })
+        }
+      }
+
+      const observable = originalExecuteMutation.call(environment, request)
+
+      return Observable.create((sink) => {
+        if (mutationError) {
+          setTimeout(() => {
+            sink.error(new Error(mutationError))
+          }, 100)
+        } else {
+          observable.subscribe({
+            complete: () => {
+              setTimeout(() => {
+                sink.complete()
+              }, 100)
+            },
+          })
+        }
+      })
+    }
+
+    return () => {
+      environment.executeMutation = originalExecuteMutation
+    }
+  }, [environment, queueOperationResolver])
+
+  return <Story />
+}
+
+export default withMutationResolver

packages/components/CHANGELOG.md

@@ -1,5 +1,70 @@
 # @baseapp-frontend/components
 
+## 1.0.25
+
+### Patch Changes
+
+- Forward LogoProps to make them customizable
+
+## 1.0.24
+
+### Patch Changes
+
+- Add user activities to the Activity Log
+  - updated dependencies
+    - @baseapp-frontend/components
+
+## 1.0.23
+
+### Patch Changes
+
+- Refactor AccountPopover and improve some tests
+
+## 1.0.22
+
+### Patch Changes
+
+- Add NotificationsList and NotificationBellWithBadge to native components
+- Updated dependencies
+  - @baseapp-frontend/design-system@1.0.9
+
+## 1.0.21
+
+### Patch Changes
+
+- Change `Link` component in `NavItem`, to use Link from next/link instead of Material UI Link.
+- Change `Header` border bottom from dashed to solid
+
+## 1.0.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @baseapp-frontend/authentication@4.1.9
+
+## 1.0.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @baseapp-frontend/design-system@1.0.8
+
+## 1.0.18
+
+### Patch Changes
+
+- Moved ProfileSettingsComponent and related queries and mutations from `baseapp-frontend-template`
+- Updated dependencies
+  - @baseapp-frontend/design-system@1.0.7
+
+## 1.0.17
+
+### Patch Changes
+
+- Fix image path handling for profile images
+- Updated dependencies
+  - @baseapp-frontend/authentication@4.1.8
+
 ## 1.0.16
 
 ### Patch Changes