Updating SSO types + minor fixes

clients/admin-ui/src/features/configure-consent/AddModal.tsx

@@ -45,7 +45,7 @@ const AddModal = ({
           </Heading>
         </Box>
       </ModalHeader>
-      <ModalBody pb={4} overflow="scroll">
+      <ModalBody pb={4} overflow="auto">
         {children}
       </ModalBody>
     </ModalContent>

clients/admin-ui/src/features/openid-authentication/SSOProvider.tsx

@@ -19,21 +19,31 @@ const SSOProvider = ({
 }: {
   openIDProvider: OpenIDProvider;
 }) => {
-  const { onOpen, isOpen, onClose } = useDisclosure();
-  const { isOpen: deleteIsOpen, onClose: onDeleteClose } = useDisclosure();
+  const {
+    onOpen: onEditOpen,
+    isOpen: isEditOpen,
+    onClose: onEditClose,
+  } = useDisclosure();
+  const {
+    onOpen: onDeleteOpen,
+    isOpen: deleteIsOpen,
+    onClose: onDeleteClose,
+  } = useDisclosure();
   const toast = useToast();
 
   const [deleteOpenIDProviderMutation] = useDeleteOpenIDProviderMutation();
 
   const handleDelete = async () => {
-    const result = await deleteOpenIDProviderMutation(openIDProvider.id);
+    const result = await deleteOpenIDProviderMutation(
+      openIDProvider.identifier,
+    );
     if (isErrorResult(result)) {
       toast(errorToastParams(getErrorMessage(result.error)));
       onDeleteClose();
       return;
     }
 
-    toast(successToastParams(`OpenID Provider deleted successfully`));
+    toast(successToastParams(`SSO provider deleted successfully`));
 
     onDeleteClose();
   };
@@ -69,7 +79,7 @@ const SSOProvider = ({
           size="sm"
           marginRight="12px"
           variant="outline"
-          onClick={onDeleteClose}
+          onClick={onDeleteOpen}
           data-testid="remove-sso-provider-btn"
         >
           Remove
@@ -78,15 +88,15 @@ const SSOProvider = ({
           size="sm"
           marginRight="12px"
           variant="outline"
-          onClick={onOpen}
+          onClick={onEditOpen}
           data-testid="edit-sso-provider-btn"
         >
           Edit
         </Button>
       </Box>
       <EditSSOProviderModal
-        isOpen={isOpen}
-        onClose={onClose}
+        isOpen={isEditOpen}
+        onClose={onEditClose}
         openIDProvider={openIDProvider}
       />
       <ConfirmationModal

clients/admin-ui/src/features/openid-authentication/SSOProviderForm.tsx

@@ -12,21 +12,31 @@ import {
   useCreateOpenIDProviderMutation,
   useUpdateOpenIDProviderMutation,
 } from "~/features/openid-authentication/openprovider.slice";
-import { OpenIDProvider } from "~/types/api";
+import {
+  OpenIDProvider,
+  OpenIDProviderCreate,
+  ProviderEnum,
+} from "~/types/api";
 
 interface SSOProviderFormProps {
   openIDProvider?: OpenIDProvider;
   onSuccess?: (openIDProvider: OpenIDProvider) => void;
   onClose: () => void;
 }
 
-export interface SSOProviderFormValues extends OpenIDProvider {}
+export type SSOProviderFormValues = Omit<
+  OpenIDProviderCreate,
+  "provider" | "client_id" | "client_secret"
+> & {
+  id?: string;
+  provider?: ProviderEnum;
+  client_id?: string;
+  client_secret?: string;
+};
 
 export const defaultInitialValues: SSOProviderFormValues = {
-  id: "",
   identifier: "",
   name: "",
-  provider: "",
   client_id: "",
   client_secret: "",
 };
@@ -67,21 +77,21 @@ const SSOProviderForm = ({
   ) => {
     const handleResult = (
       result:
-        | { data: object }
+        | { data: OpenIDProvider }
         | { error: FetchBaseQueryError | SerializedError },
     ) => {
       if (isErrorResult(result)) {
         const errorMsg = getErrorMessage(
           result.error,
-          "An unexpected error occurred while editing the OpenID Provider. Please try again.",
+          "An unexpected error occurred while editing the SSO provider. Please try again.",
         );
         toast(errorToastParams(errorMsg));
       } else {
-        toast(successToastParams("OpenID Provider configuration saved."));
+        toast(successToastParams("SSO provider configuration saved."));
         onClose();
         formikHelpers.resetForm({});
         if (onSuccess) {
-          onSuccess(values);
+          onSuccess(result.data);
         }
       }
     };
@@ -164,6 +174,7 @@ const SSOProviderForm = ({
               tooltip="Unique identifier for your provider"
               variant="stacked"
               isRequired
+              disabled={!!initialValues.id}
             />
             <CustomTextInput
               id="name"

clients/admin-ui/src/features/openid-authentication/SSOProvidersSection.tsx

@@ -11,7 +11,7 @@ const SSOProvidersSection = () => {
 
   const renderItems: () => JSX.Element[] | undefined = () =>
     openidProviders?.map((item: OpenIDProvider) => (
-      <SSOProvider key={item.id} openIDProvider={item} />
+      <SSOProvider key={item.identifier} openIDProvider={item} />
     ));
 
   return (

clients/admin-ui/src/features/openid-authentication/openprovider.slice.ts

@@ -36,10 +36,10 @@ const openIDProviderApi = baseApi.injectEndpoints({
     }),
     updateOpenIDProvider: build.mutation<
       OpenIDProvider,
-      Partial<OpenIDProvider> & Pick<OpenIDProvider, "id">
+      Partial<OpenIDProvider> & Pick<OpenIDProvider, "identifier">
     >({
       query: (params) => ({
-        url: `plus/openid-provider/${params.id}`,
+        url: `plus/openid-provider/${params.identifier}`,
         method: "PATCH",
         body: params,
       }),

clients/admin-ui/src/features/user-management/UserForm.tsx

@@ -109,7 +109,7 @@ const UserForm = ({ onSubmit, initialValues, canEditNames }: Props) => {
   const { data: openidProviders } = useGetAllOpenIDProvidersQuery();
 
   const passwordFieldIsRequired =
-    !flags.openIDAuthentication || !openidProviders?.length;
+    !flags.ssoAuthentication || !openidProviders?.length;
 
   if (!passwordFieldIsRequired) {
     validationSchema = ValidationSchema.shape({

clients/admin-ui/src/flags.json

@@ -36,8 +36,8 @@
     "test": true,
     "production": false
   },
-  "openIDAuthentication": {
-    "description": "OpenID authentication",
+  "ssoAuthentication": {
+    "description": "SSO Authentication Providers (OpenID)",
     "development": true,
     "test": true,
     "production": false

clients/admin-ui/src/mocks/data.ts

@@ -273,13 +273,11 @@ export const mockConsentableItems: ConsentableItem[] = [
     external_id: "34419",
     type: "Channel",
     name: "Default SMS channel (SMS)",
-    notice_id: null,
     children: [
       {
         external_id: "40007",
         type: "Message type",
         name: "Default SMS message type",
-        notice_id: null,
         children: [],
         unmapped: true,
       },
@@ -290,13 +288,11 @@ export const mockConsentableItems: ConsentableItem[] = [
     external_id: "34415",
     type: "Channel",
     name: "Default InApp channel (InApp)",
-    notice_id: null,
     children: [
       {
         external_id: "40003",
         type: "Message type",
         name: "Default InApp message type",
-        notice_id: null,
         children: [],
         unmapped: true,
       },
@@ -307,13 +303,11 @@ export const mockConsentableItems: ConsentableItem[] = [
     external_id: "33843",
     type: "Channel",
     name: "Push Marketing Channel (Push)",
-    notice_id: null,
     children: [
       {
         external_id: "39240",
         type: "Message type",
         name: "Push Marketing Message",
-        notice_id: null,
         children: [],
         unmapped: true,
       },
@@ -324,13 +318,11 @@ export const mockConsentableItems: ConsentableItem[] = [
     external_id: "33842",
     type: "Channel",
     name: "Transactional Channel (Email)",
-    notice_id: null,
     children: [
       {
         external_id: "39239",
         type: "Message type",
         name: "Transactional Message",
-        notice_id: null,
         children: [],
         unmapped: true,
       },
@@ -341,21 +333,18 @@ export const mockConsentableItems: ConsentableItem[] = [
     external_id: "33841",
     type: "Channel",
     name: "Marketing Channel (Email)",
-    notice_id: null,
     children: [
       {
         external_id: "40000",
         type: "Message type",
         name: "Untitled message type",
-        notice_id: null,
         children: [],
         unmapped: true,
       },
       {
         external_id: "39238",
         type: "Message type",
         name: "Marketing Message",
-        notice_id: null,
         children: [],
         unmapped: true,
       },

clients/admin-ui/src/pages/settings/organization.tsx

@@ -18,7 +18,7 @@ const OrganizationPage: NextPage = () => {
   );
   const {
     plus: hasPlus,
-    flags: { openIDAuthentication },
+    flags: { ssoAuthentication },
   } = useFeatures();
 
   return (
@@ -36,7 +36,7 @@ const OrganizationPage: NextPage = () => {
           <Box background="gray.50" padding={2}>
             <OrganizationForm organization={organization} />
           </Box>
-          {openIDAuthentication && hasPlus && (
+          {ssoAuthentication && hasPlus && (
             <Restrict scopes={[ScopeRegistryEnum.OPENID_PROVIDER_CREATE]}>
               <OpenIDAuthenticationSection />
             </Restrict>

clients/admin-ui/src/types/api/index.ts

@@ -197,6 +197,7 @@ export type { IdentityTypes } from "./models/IdentityTypes";
 export type { IdentityVerificationConfigResponse } from "./models/IdentityVerificationConfigResponse";
 export { IncludeExcludeEnum } from "./models/IncludeExcludeEnum";
 export type { Language } from "./models/Language";
+export { Layer1ButtonOption } from "./models/Layer1ButtonOption";
 export { LegalBasisForProcessingEnum } from "./models/LegalBasisForProcessingEnum";
 export { LegalBasisForProfilingEnum } from "./models/LegalBasisForProfilingEnum";
 export type { LimitedPrivacyNoticeResponseSchema } from "./models/LimitedPrivacyNoticeResponseSchema";
@@ -253,6 +254,9 @@ export type { NoticeTranslationCreate } from "./models/NoticeTranslationCreate";
 export type { NoticeTranslationResponse } from "./models/NoticeTranslationResponse";
 export type { NotificationApplicationConfig } from "./models/NotificationApplicationConfig";
 export type { OktaConfig } from "./models/OktaConfig";
+export type { OpenIDProvider } from "./models/OpenIDProvider";
+export type { OpenIDProviderCreate } from "./models/OpenIDProviderCreate";
+export type { OpenIDProviderSimple } from "./models/OpenIDProviderSimple";
 export type { Organization } from "./models/Organization";
 export type { OrganizationMetadata } from "./models/OrganizationMetadata";
 export type { Page_BasicSystemResponse_ } from "./models/Page_BasicSystemResponse_";
@@ -306,7 +310,6 @@ export type { PreApprovalWebhookResponse } from "./models/PreApprovalWebhookResp
 export type { PreApprovalWebhookUpdate } from "./models/PreApprovalWebhookUpdate";
 export type { PreferencesSaved } from "./models/PreferencesSaved";
 export type { PreferencesSavedExtended } from "./models/PreferencesSavedExtended";
-export type { OpenIDProvider } from "./models/OpenIDProvider";
 export type { PreferenceWithNoticeInformation } from "./models/PreferenceWithNoticeInformation";
 export type { PrivacyCenterConfig } from "./models/PrivacyCenterConfig";
 export type { PrivacyDeclaration } from "./models/PrivacyDeclaration";
@@ -337,6 +340,7 @@ export type { PrivacyRequestVerboseResponse } from "./models/PrivacyRequestVerbo
 export type { PrivacyRule } from "./models/PrivacyRule";
 export type { Property } from "./models/Property";
 export { PropertyType } from "./models/PropertyType";
+export { ProviderEnum } from "./models/ProviderEnum";
 export type { PublicPropertyResponse } from "./models/PublicPropertyResponse";
 export type { PurposesResponse } from "./models/PurposesResponse";
 export type { QueryParam } from "./models/QueryParam";

clients/admin-ui/src/types/api/models/ConsentableItem.ts

@@ -1,11 +1,15 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
 /**
- * 3rd-party consentable item and privacy notice relationships
+ * Schema to represent 3rd-party consentable items and privacy notice relationships.
  */
-export interface ConsentableItem {
+export type ConsentableItem = {
   external_id: string;
   type: string;
   name: string;
-  notice_id?: string | null;
-  children?: ConsentableItem[];
+  notice_id?: string;
+  children?: Array<ConsentableItem>;
   unmapped?: boolean;
-}
+};

clients/admin-ui/src/types/api/models/ExperienceConfigCreate.ts

@@ -2,9 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Layer1ButtonOption } from "~/features/privacy-experience/form/constants";
 import type { ComponentType } from "./ComponentType";
 import type { ExperienceTranslationCreate } from "./ExperienceTranslationCreate";
+import type { Layer1ButtonOption } from "./Layer1ButtonOption";
 import type { MinimalProperty } from "./MinimalProperty";
 import type { PrivacyNoticeRegion } from "./PrivacyNoticeRegion";
 

clients/admin-ui/src/types/api/models/ExperienceConfigResponse.ts

@@ -2,9 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Layer1ButtonOption } from "~/features/privacy-experience/form/constants";
 import type { ComponentType } from "./ComponentType";
 import type { ExperienceTranslationResponse } from "./ExperienceTranslationResponse";
+import type { Layer1ButtonOption } from "./Layer1ButtonOption";
 import type { MinimalProperty } from "./MinimalProperty";
 import type { PrivacyNoticeRegion } from "./PrivacyNoticeRegion";
 import type { PrivacyNoticeResponse } from "./PrivacyNoticeResponse";

clients/admin-ui/src/types/api/models/ExperienceConfigResponseNoNotices.ts

@@ -2,9 +2,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Layer1ButtonOption } from "~/features/privacy-experience/form/constants";
 import type { ComponentType } from "./ComponentType";
 import type { ExperienceTranslationResponse } from "./ExperienceTranslationResponse";
+import type { Layer1ButtonOption } from "./Layer1ButtonOption";
 import type { MinimalProperty } from "./MinimalProperty";
 import type { PrivacyNoticeRegion } from "./PrivacyNoticeRegion";
 import type { SupportedLanguage } from "./SupportedLanguage";

clients/admin-ui/src/types/api/models/ExperienceConfigUpdate.ts

@@ -2,8 +2,8 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import { Layer1ButtonOption } from "~/features/privacy-experience/form/constants";
 import type { ExperienceTranslation } from "./ExperienceTranslation";
+import type { Layer1ButtonOption } from "./Layer1ButtonOption";
 import type { MinimalProperty } from "./MinimalProperty";
 import type { PrivacyNoticeRegion } from "./PrivacyNoticeRegion";
 

clients/admin-ui/src/types/api/models/Layer1ButtonOption.ts

@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+/**
+ * Layer 1 button options - not formalized in the db
+ */
+export enum Layer1ButtonOption {
+  ACKNOWLEDGE = "acknowledge",
+  OPT_IN_OPT_OUT = "opt_in_opt_out",
+}