From adfc2f234d146e80695623af768b15d2616df8c4 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 3 Mar 2022 07:52:11 +1000
Subject: [PATCH] Remove unused SSO Form code (#701)

* Remove unused SAML Artifact Binding properties

* Remove unused validators
---
 angular/src/validators/dirty.validator.ts     | 23 +++----------------
 .../src/validators/requiredIf.validator.ts    | 10 --------
 common/src/enums/ssoEnums.ts                  |  1 -
 common/src/models/api/ssoConfigApi.ts         |  5 ----
 common/src/models/view/ssoConfigView.ts       |  2 --
 5 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 angular/src/validators/requiredIf.validator.ts

diff --git a/angular/src/validators/dirty.validator.ts b/angular/src/validators/dirty.validator.ts
index 25734944..66ba2be0 100644
--- a/angular/src/validators/dirty.validator.ts
+++ b/angular/src/validators/dirty.validator.ts
@@ -1,25 +1,8 @@
-import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from "@angular/forms";
-
-import { requiredIf } from "./requiredIf.validator";
+import { AbstractControl, ValidationErrors, Validators } from "@angular/forms";
 
 /**
- * A higher order function that takes a ValidatorFn and returns a new validator.
- * The new validator only runs the ValidatorFn if the control is dirty. This prevents error messages from being
- * displayed to the user prematurely.
- */
-function dirtyValidator(validator: ValidatorFn) {
-  return (control: AbstractControl): ValidationErrors | null => {
-    return control.dirty ? validator(control) : null;
-  };
-}
-
-export function dirtyRequiredIf(predicate: (predicateCtrl: AbstractControl) => boolean) {
-  return dirtyValidator(requiredIf(predicate));
-}
-
-/**
- * Equivalent to dirtyValidator(Validator.required), however using dirtyValidator returns a new function
- * each time which prevents formControl.hasError from properly comparing functions for equality.
+ * Runs Validators.required on a field only if it's dirty. This prevents error messages from being displayed
+ * to the user prematurely.
  */
 export function dirtyRequired(control: AbstractControl): ValidationErrors | null {
   return control.dirty ? Validators.required(control) : null;
diff --git a/angular/src/validators/requiredIf.validator.ts b/angular/src/validators/requiredIf.validator.ts
deleted file mode 100644
index 50d5ecf7..00000000
--- a/angular/src/validators/requiredIf.validator.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { AbstractControl, ValidationErrors, Validators } from "@angular/forms";
-
-/**
- * Returns a new validator which will apply Validators.required only if the predicate is true.
- */
-export function requiredIf(predicate: (predicateCtrl: AbstractControl) => boolean) {
-  return (control: AbstractControl): ValidationErrors | null => {
-    return predicate(control) ? Validators.required(control) : null;
-  };
-}
diff --git a/common/src/enums/ssoEnums.ts b/common/src/enums/ssoEnums.ts
index fdf9c0b7..d9be7274 100644
--- a/common/src/enums/ssoEnums.ts
+++ b/common/src/enums/ssoEnums.ts
@@ -12,7 +12,6 @@ export enum OpenIdConnectRedirectBehavior {
 export enum Saml2BindingType {
   HttpRedirect = 1,
   HttpPost = 2,
-  Artifact = 4,
 }
 
 export enum Saml2NameIdFormat {
diff --git a/common/src/models/api/ssoConfigApi.ts b/common/src/models/api/ssoConfigApi.ts
index de0b059e..0767f3d6 100644
--- a/common/src/models/api/ssoConfigApi.ts
+++ b/common/src/models/api/ssoConfigApi.ts
@@ -40,7 +40,6 @@ export class SsoConfigApi extends BaseResponse {
       api.idpBindingType = view.saml.idpBindingType;
       api.idpSingleSignOnServiceUrl = view.saml.idpSingleSignOnServiceUrl;
       api.idpSingleLogoutServiceUrl = view.saml.idpSingleLogoutServiceUrl;
-      api.idpArtifactResolutionServiceUrl = view.saml.idpArtifactResolutionServiceUrl;
       api.idpX509PublicCert = view.saml.idpX509PublicCert;
       api.idpOutboundSigningAlgorithm = view.saml.idpOutboundSigningAlgorithm;
       api.idpAllowUnsolicitedAuthnResponse = view.saml.idpAllowUnsolicitedAuthnResponse;
@@ -83,7 +82,6 @@ export class SsoConfigApi extends BaseResponse {
   idpBindingType: Saml2BindingType;
   idpSingleSignOnServiceUrl: string;
   idpSingleLogoutServiceUrl: string;
-  idpArtifactResolutionServiceUrl: string;
   idpX509PublicCert: string;
   idpOutboundSigningAlgorithm: string;
   idpAllowUnsolicitedAuthnResponse: boolean;
@@ -125,9 +123,6 @@ export class SsoConfigApi extends BaseResponse {
     this.idpBindingType = this.getResponseProperty("IdpBindingType");
     this.idpSingleSignOnServiceUrl = this.getResponseProperty("IdpSingleSignOnServiceUrl");
     this.idpSingleLogoutServiceUrl = this.getResponseProperty("IdpSingleLogoutServiceUrl");
-    this.idpArtifactResolutionServiceUrl = this.getResponseProperty(
-      "IdpArtifactResolutionServiceUrl"
-    );
     this.idpX509PublicCert = this.getResponseProperty("IdpX509PublicCert");
     this.idpOutboundSigningAlgorithm = this.getResponseProperty("IdpOutboundSigningAlgorithm");
     this.idpAllowUnsolicitedAuthnResponse = this.getResponseProperty(
diff --git a/common/src/models/view/ssoConfigView.ts b/common/src/models/view/ssoConfigView.ts
index c2910a53..b4784c36 100644
--- a/common/src/models/view/ssoConfigView.ts
+++ b/common/src/models/view/ssoConfigView.ts
@@ -42,7 +42,6 @@ export class SsoConfigView extends View {
     idpBindingType: Saml2BindingType;
     idpSingleSignOnServiceUrl: string;
     idpSingleLogoutServiceUrl: string;
-    idpArtifactResolutionServiceUrl: string;
     idpX509PublicCert: string;
     idpOutboundSigningAlgorithm: string;
     idpAllowUnsolicitedAuthnResponse: boolean;
@@ -89,7 +88,6 @@ export class SsoConfigView extends View {
         idpBindingType: api.idpBindingType,
         idpSingleSignOnServiceUrl: api.idpSingleSignOnServiceUrl,
         idpSingleLogoutServiceUrl: api.idpSingleLogoutServiceUrl,
-        idpArtifactResolutionServiceUrl: api.idpArtifactResolutionServiceUrl,
         idpX509PublicCert: api.idpX509PublicCert,
         idpOutboundSigningAlgorithm: api.idpOutboundSigningAlgorithm,
         idpAllowUnsolicitedAuthnResponse: api.idpAllowUnsolicitedAuthnResponse,