Merge branch 'master' into master

wso2 · May 6, 2024 · c935939 · c935939
2 parents 44e39dd + 25632d9
commit c935939
Show file tree

Hide file tree

Showing 134 changed files with 38,353 additions and 16,143 deletions.
diff --git a/b2b-sample/README.md b/b2b-sample/README.md
@@ -67,6 +67,9 @@ Select `Email`, `First Name`, `Last Name`, and `Username` from the list of attri
 >| Authorized redirect URLs | `http://localhost:3001/api/auth/callback/wso2isAdmin` and `http://localhost:3001` |
 >| Allowed origin           |                           `http://localhost:3001`                           |
 
+Also, On the User Attributes tab, click on + Add User Attributes.
+Select `Email`, `First Name`, `Last Name`, and `Username` from the list of attributes.
+
 - Navigate to the **Shared Access** tab of both created application.
 - Select **Share with all organizations**, if you want to share your application with all existing organizations and every organization that will be created future.
 - If you want to share the application with only a set of organizations when the organizations are onboarded, chose **Share with only selected organizations** option and select the required organizations.

diff --git a/etc/sample-post-authentication-handler/pom.xml b/etc/sample-post-authentication-handler/pom.xml
@@ -78,7 +78,7 @@
                             javax.servlet.http,
                             org.apache.commons.logging,
                             org.osgi.framework,
-                            org.osgi.service.component,
+                            org.osgi.service.component.*;version="${osgi.service.component.imp.pkg.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config,
                             org.wso2.carbon.identity.application.authentication.framework.config.model,
                             org.wso2.carbon.identity.application.authentication.framework.context,

diff --git a/...o2/carbon/identity/post/authn/handler/disclaimer/DisclaimerPostAuthenticationHandler.java b/...o2/carbon/identity/post/authn/handler/disclaimer/DisclaimerPostAuthenticationHandler.java
@@ -18,16 +18,17 @@
 
 package org.wso2.carbon.identity.post.authn.handler.disclaimer;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.wso2.carbon.identity.application.authentication.framework.config.ConfigurationFacade;
 import org.wso2.carbon.identity.application.authentication.framework.context.AuthenticationContext;
 import org.wso2.carbon.identity.application.authentication.framework.exception.PostAuthenticationFailedException;
 import org.wso2.carbon.identity.application.authentication.framework.handler.request.AbstractPostAuthnHandler;
 import org.wso2.carbon.identity.application.authentication.framework.handler.request.PostAuthnHandlerFlowStatus;
 import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
-import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -54,15 +55,20 @@ public PostAuthnHandlerFlowStatus handle(HttpServletRequest httpServletRequest,
             }
         } else {
             try {
+                String urlEncodedApplicationName = new URI(null, null, authenticationContext
+                        .getSequenceConfig().getApplicationConfig().getApplicationName(), null).toASCIIString();
+
                 httpServletResponse.sendRedirect
-                        (ConfigurationFacade.getInstance().getAuthenticationEndpointURL().replace("/login.do", ""
-                        ) + "/disclaimer" + ".jsp?sessionDataKey=" + authenticationContext.getContextIdentifier() +
-                                "&application=" + authenticationContext
-                                .getSequenceConfig().getApplicationConfig().getApplicationName());
+                        (ConfigurationFacade.getInstance().getAuthenticationEndpointURL().replace("/login.do", "") +
+                                "/disclaimer.jsp?sessionDataKey=" + authenticationContext.getContextIdentifier() +
+                                "&application=" + urlEncodedApplicationName);
                 setConsentPoppedUpState(authenticationContext);
                 return PostAuthnHandlerFlowStatus.INCOMPLETE;
             } catch (IOException e) {
                 throw new PostAuthenticationFailedException("Invalid Consent", "Error while redirecting", e);
+            } catch (URISyntaxException e) {
+                throw new PostAuthenticationFailedException("Invalid Application Name",
+                        "Error encoding application name", e);
             }
         }
     }

diff --git a/.../custom-grant/src/main/java/org/wso2/sample/identity/oauth2/grant/mobile/MobileGrant.java b/.../custom-grant/src/main/java/org/wso2/sample/identity/oauth2/grant/mobile/MobileGrant.java
@@ -30,6 +30,8 @@
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * New grant type for Identity Server
@@ -158,22 +160,21 @@ public boolean validateScope(OAuthTokenReqMessageContext tokReqMsgCtx)
 
 
     /**
-     * TODO
-     *
      * You need to implement how to validate the mobile number
      *
-     * @param mobileNumber
-     * @return
+     * @param mobileNumber Mobile number of the user.
+     * @return true if the mobile number is valid, otherwise false.
      */
     private boolean isValidMobileNumber(String mobileNumber){
 
-        // just demo validation
-
-        if(mobileNumber.startsWith("033")){
-            return true;
-        }
-
-        return false;
+        // Regular expression to match 10 digits, with optional country code
+        String pattern = "^(\\+\\d{1,3})?\\d{10}$";
+        // Create a Pattern object
+        Pattern r = Pattern.compile(pattern);
+        // Create Matcher object
+        Matcher m = r.matcher(mobileNumber);
+        // Check if the pattern matches
+        return m.matches();
     }
 
     @Override

diff --git a/...s-admin-app/components/sections/sections/getStartedSection/getStartedSectionComponent.tsx b/...s-admin-app/components/sections/sections/getStartedSection/getStartedSectionComponent.tsx
@@ -19,7 +19,7 @@
 import Image from "next/image";
 import { FlexboxGrid } from "rsuite";
 import GetStartedText from "./otherComponents/getStartedText";
-import getStartedImage from "../../../../../../libs/business-admin-app/ui/ui-assets/src/lib/images/getStarted.svg";
+import getStartedImage from "../../../../../../libs/business-admin-app/ui/ui-assets/src/lib/images/getStarted.png";
 
 /**
  * 

diff --git a/...ss-admin-app/components/sections/sections/getStartedSection/getStartedSectionForAdmin.tsx b/...ss-admin-app/components/sections/sections/getStartedSection/getStartedSectionForAdmin.tsx
@@ -160,7 +160,7 @@ export default function GetStartedSectionComponentForAdmin(props: GetStartedSect
                                         filteredCount["nutrition"])
 
                                     ],
-                                    backgroundColor: [ "#4e40ed", "#4e5ded", "#4e7eed", "#4e9bed", "#77b0ed" ]
+                                    backgroundColor: [ "#", "#4e5ded", "#4e7eed", "#4e9bed", "#77b0ed" ]
                                 }
                             ]
                         },
@@ -229,7 +229,11 @@ export default function GetStartedSectionComponentForAdmin(props: GetStartedSect
             <div className={ styles.welcomeMainDiv }>
                 <AccountCircleIcon style={ { width: "8vh", height: "8vh" } }/>
                 <div className={ styles. welcomeDiv }>
-                    { "Welcome, " + session.user?.name.givenName + " " + session.user?.name.familyName + "!" }
+                    { "Welcome, " }
+                    <b>{ session.user?.name.givenName }</b> 
+                    { " " }
+                    <b>{ session.user?.name.familyName }</b>
+                    { "!" }
                 </div>
                 <div className={ styles.tagLine }>
                     { "Taking Veterinary Care to the Next Level of Excellence" }

diff --git a/...s-admin-app/components/sections/sections/getStartedSection/getStartedSectionForDoctor.tsx b/...s-admin-app/components/sections/sections/getStartedSection/getStartedSectionForDoctor.tsx
@@ -166,7 +166,7 @@ export default function GetStartedSectionComponentForDoctor(props: GetStartedSec
                             datasets: [
                                 {
                                     data: [ filteredCount["confirmed"], filteredCount["completed"] ],
-                                    backgroundColor: [ "#4e40ed", "#4e7eed" ]
+                                    backgroundColor: [ "#69A2F4", "#4e7eed" ]
                                 }
                             ]
                         },

diff --git a/...admin-app/components/sections/sections/getStartedSection/getStartedSectionForPetOwner.tsx b/...admin-app/components/sections/sections/getStartedSection/getStartedSectionForPetOwner.tsx
@@ -106,7 +106,7 @@ export default function GetStartedSectionComponentForPetOwner(props: GetStartedS
                                         filteredCount["rabbit"], 
                                         petList?.length-
                                     (filteredCount["dog"]+ filteredCount["cat"]+filteredCount["rabbit"]) ],
-                                    backgroundColor: [ "#4e40ed", "#4e5ded", "#4e7eed", "#4e9bed" ]
+                                    backgroundColor: [ "#69A2F4", "#4e5ded", "#4e7eed", "#4e9bed" ]
                                 }
                             ]
                         },

diff --git a/...min-app/components/sections/sections/getStartedSection/otherComponents/getStartedText.tsx b/...min-app/components/sections/sections/getStartedSection/otherComponents/getStartedText.tsx
@@ -20,8 +20,6 @@ import { LogoComponent } from "@pet-management-webapp/business-admin-app/ui/ui-c
 import PagePreviousIcon from "@rsuite/icons/PagePrevious";
 import Image from "next/image";
 import { Button, Panel, Stack } from "rsuite";
-import getStartedWelcomeImage from
-    "../../../../../../../libs/business-admin-app/ui/ui-assets/src/lib/images/getStartedWelcome.svg";
 import styles from "../../../../../styles/Settings.module.css";
 
 export default function GetStartedText() {
@@ -31,23 +29,18 @@ export default function GetStartedText() {
 
                 <Stack direction="column" spacing={ 50 } justifyContent="center">
 
-                    <Image src={ getStartedWelcomeImage } alt="profile image" width={ 150 } />
-
                     <Stack direction="column" spacing={ 10 } justifyContent="center">
                         <p><strong>Welcome to</strong></p>
                         <LogoComponent imageSize="medium" />
                     </Stack>
 
                     <p className={ styles.getStartedSectionComponentGetStartedTextP }>
-                    Welcome to Pet Care – the ultimate companion for every pet owner! 
-                    Our app is designed with a deep understanding of the unique bond between you and 
-                    your furry friends. Whether you have a playful pup, a curious cat, or any other beloved pet, 
-                    Pet Care is here to simplify and enhance every aspect of pet ownership.
+                        Schedule appointments & keep your furry friend healthy – all at your fingertips.
                     </p>
 
                     <Stack direction="column" spacing={ 20 } justifyContent="center">
                         <h4>Select one of the settings to get started</h4>
-                        <Button appearance="ghost" size="lg">
+                        <Button appearance="ghost" size="lg" className={ styles.getStartedButton }>
                             <Stack spacing={ 3 } justifyContent="center" alignItems="center">
                                 <PagePreviousIcon />
                                 <p>Get Started</p>

diff --git a/...apps/business-admin-app/components/sections/sections/sectionsReatedToPetOwner/petCard.tsx b/...apps/business-admin-app/components/sections/sections/sectionsReatedToPetOwner/petCard.tsx
@@ -84,7 +84,7 @@ function PetCard(props: PetCardProps) {
                                 />
                             ) : (
                                 <Image
-                                    style={ { borderRadius: "10%", height: "100%", width: "100%" } }
+                                    style={ { borderRadius: "10%", height: "70%", width: "70%" } }
                                     src={ PET_IMAGE }
                                     alt="pet-thumbnail"
                                 />

diff --git a/...business-admin-app/components/sections/sections/sectionsRelatedToDoctor/doctorProfile.tsx b/...business-admin-app/components/sections/sections/sectionsRelatedToDoctor/doctorProfile.tsx
@@ -102,6 +102,7 @@ export default function DoctorProfileSection(props: DoctorProfileSectionProps) {
                     <p>{ "Profile Information of the doctor" }</p>
                 </Stack>
                 <Button
+                    className={ styles.buttonCircular }
                     appearance="primary"
                     size="lg"
                     onClick={ onEditProfileClick }

diff --git a/...business-admin-app/components/sections/sections/sectionsRelatedToDoctor/imageUploader.tsx b/...business-admin-app/components/sections/sections/sectionsRelatedToDoctor/imageUploader.tsx
@@ -82,7 +82,7 @@ function FileUploadSingle(props: FileUploadProps) {
                 appearance="primary"
                 style={ {
                     border: "none",
-                    borderRadius: "5px",
+                    borderRadius: "22px",
                     boxShadow: "7px 6px 28px 1px rgba(0, 0, 0, 0.24)",
                     color: "#fff",
                     cursor: "pointer",
@@ -109,7 +109,7 @@ function FileUploadSingle(props: FileUploadProps) {
                 appearance="primary"
                 style={ {
                     border: "none",
-                    borderRadius: "5px",
+                    borderRadius: "22px",
                     boxShadow: "7px 6px 28px 1px rgba(0, 0, 0, 0.24)",
                     color: "#fff",
                     cursor: "pointer",

diff --git a/...business-admin-app/components/sections/sections/sectionsRelatedToDoctor/manageDoctors.tsx b/...business-admin-app/components/sections/sections/sectionsRelatedToDoctor/manageDoctors.tsx
@@ -95,8 +95,7 @@ export default function ManageDoctorsSection(props: ManageDoctorsSectionProps) {
                     <p>{ "Manage doctors in the organization" }</p>
                 </Stack>
                 <Button
-                    appearance="primary"
-                    size="lg"
+                    className={ styles.buttonCircular }
                     onClick={ onAddDoctorClick }
                 >
                         Add Doctor

diff --git a/...nts/sections/sections/settingsSection/manageUserSection/otherComponents/addUserButton.tsx b/...nts/sections/sections/settingsSection/manageUserSection/otherComponents/addUserButton.tsx
@@ -17,6 +17,7 @@
  */
 
 import { Button } from "rsuite";
+import styles from "../../../../../../styles/app.module.css";
 
 interface AddUserButtonProps {
     onClick : ()=>void
@@ -28,8 +29,7 @@ export default function AddUserButton(props : AddUserButtonProps) {
 
     return (
         <Button
-            appearance="primary"
-            size="lg"
+            className={ styles.buttonCircular }
             onClick={ onClick }>
             Add User
         </Button>

diff --git a/...business-admin-app/components/sections/sections/settingsSection/mfaSection/emailAsMFA.tsx b/...business-admin-app/components/sections/sections/settingsSection/mfaSection/emailAsMFA.tsx
@@ -118,7 +118,7 @@ export default function EmailAsMFA(props: EmailAsMFAProps) {
                             : (
                                 <FlexboxGrid.Item colspan={ 6 }>
                                     <Button 
-                                        style={ { width: "125%", opacity:"0.9" } } 
+                                        style={ { width: "125%", opacity:"0.9", borderRadius: "22px" } } 
                                         appearance="primary" 
                                         onClick={ onAddToLoginFlowClick }>
                                         Add to the Login Flow

diff --git a/...s/business-admin-app/components/sections/sections/settingsSection/mfaSection/smsAsMFA.tsx b/...s/business-admin-app/components/sections/sections/settingsSection/mfaSection/smsAsMFA.tsx
@@ -112,7 +112,7 @@ export default function SmsAsMFA(props: SmsAsMFAProps) {
                             : (
                                 <FlexboxGrid.Item colspan={ 6 }>
                                     <Button 
-                                        style={ { width: "125%", opacity:"0.9" } } 
+                                        style={ { width: "125%", opacity:"0.9", borderRadius: "22px" } } 
                                         appearance="primary" 
                                         onClick={ onAddToLoginFlowClick }>
                                         Add to the Login Flow

diff --git a/.../business-admin-app/components/sections/sections/settingsSection/mfaSection/totpAsMFA.tsx b/.../business-admin-app/components/sections/sections/settingsSection/mfaSection/totpAsMFA.tsx
@@ -111,7 +111,7 @@ export default function TotpAsMFA(props: TotpAsMFAProps) {
                             : (
                                 <FlexboxGrid.Item colspan={ 6 }>
                                     <Button 
-                                        style={ { width: "125%", opacity:"0.9" } } 
+                                        style={ { width: "125%", opacity:"0.9", borderRadius: "22px" } } 
                                         appearance="primary" 
                                         onClick={ onAddToLoginFlowClick }>
                                         Add to the Login Flow

diff --git a/...tions/sections/settingsSection/personalizationSection/personalizationSectionComponent.tsx b/...tions/sections/settingsSection/personalizationSection/personalizationSectionComponent.tsx
@@ -266,7 +266,7 @@ export default function PersonalizationSectionComponent(props: PersonalizationSe
                 />
                 <Divider style={ { background: "#bebebe" } }/>
                 <Button
-                    style={ { background: "rgba(255, 0, 0, 0.8)", width: "25%" } }
+                    className={ styles["revertButton"] }
                     size="lg"
                     appearance="primary"
                     onClick={ onRevert } >

diff --git a/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/pages/index.tsx b/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/pages/index.tsx
@@ -20,7 +20,7 @@ import { IndexHomeComponent } from "@pet-management-webapp/shared/ui/ui-componen
 import { NextRouter, useRouter } from "next/router";
 import React, { useEffect } from "react";
 import "rsuite/dist/rsuite.min.css";
-import homeImage from "../../../libs/business-admin-app/ui/ui-assets/src/lib/images/businessAdminHome.jpeg";
+import homeImage from "../../../libs/business-admin-app/ui/ui-assets/src/lib/images/businessAdminHome.png";
 import { getPersonalization } from "../APICalls/GetPersonalization/get-personalization";
 import personalize from "../components/sections/sections/settingsSection/personalizationSection/personalize";
 import { Personalization } from "../types/personalization";

diff --git a/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/pages/o/[id].tsx b/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/pages/o/[id].tsx
@@ -85,7 +85,7 @@ export default function Org(props : OrgProps) {
     useEffect(() => {
         getDoctor(session.accessToken, session.user.emails[0])
             .catch((err) => {
-                if (err.response.status === 404 && session.group === "doctor") {
+                if (err.response?.status === 404 && session.group === "doctor") {
                     const payload: DoctorInfo = {
                         address: "",
                         availability: [],
@@ -106,7 +106,7 @@ export default function Org(props : OrgProps) {
                 personalize(response.data);
             })
             .catch(async (err) => {
-                if (err.response.status === 404 && session.group === "admin") {
+                if (err.response?.status === 404 && session.group === "admin") {
                     const res: BrandingPreference = 
                         (await controllerDecodeGetBrandingPreference(session) as BrandingPreference);
                     const activeTheme: string = res["preference"]["theme"]["activeTheme"];

diff --git a/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/styles/Home.module.css b/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/styles/Home.module.css
@@ -178,7 +178,7 @@
 .welcomeDiv {
     margin-top: -8vh;
     margin-left: 9vh;
-    font-weight: bold;
+    font-weight: 200;
     font-size: 3vh;
 }
 
@@ -194,7 +194,7 @@
 .tagLine {
     margin-top: 0vh;
     margin-left: 9vh;
-    font-size: 2vh;
+    font-size: 16px;
 }
 
 .upcomingBookingsDivForUser {
@@ -230,8 +230,6 @@
 
 .orgInfoInputStyle {
     width: 25vw;
-    font-size: 2vh;
-    margin-bottom: 1.5vh;
     /* padding: 0.1vh;
     margin-bottom: 1vh; */
 }

diff --git a/...e-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/styles/Settings.module.css b/...e-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/styles/Settings.module.css
@@ -53,10 +53,32 @@
     justify-content: center;
     align-items: center;
     padding: 10px;
+    border: none;
 }
 
 /* getStartedSectionComponent-GetStartedText-P */
 .getStartedSectionComponentGetStartedTextP {
     text-align: center ;
 }
 
+.revertButton{
+    width: 25%;
+    height: 50px;
+    font-size: 18px;
+    border-radius: 22px;
+    box-shadow: none;
+    font-size: 1rem;
+    font-weight: 400;
+    padding: 14px 24px;
+    background-color: rgba(255, 0, 0, 0.8);
+    color: #ffffff;
+    border-color: #e2e2e2;
+    border-width: 0;
+}
+
+.getStartedButton{
+    height: 50px;
+    font-size: 18px;
+    border-radius: 22px;
+}
+
diff --git a/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/styles/app.module.css b/petcare-sample/b2b/web-app/petvet/web/nextjs/apps/business-admin-app/styles/app.module.css
@@ -100,3 +100,17 @@
     background: #fafafa;
     cursor: pointer;
 }
+
+.buttonCircular {
+    height: 50px;
+    font-size: 18px;
+    border-radius: 22px;
+    box-shadow: none;
+    font-size: 1rem;
+    font-weight: 400;
+    padding: 14px 24px;
+    background-color: #69A2F4;
+    color: #ffffff;
+    border-color: #e2e2e2;
+    border-width: 0;
+}