Merge pull request #838 from Crown-Commercial-Service/revert-837-p2sp…

…rint16

Revert "3046 issues fixed (#836)"

src/app/pages/manage-organisation/manage-organisation-profile/manage-organisation-profile.component.html

@@ -51,8 +51,8 @@ <h2 class="govuk-heading-s"> {{ 'BUYER_SUPPLIER_TYPE' | translate }}</h2>
         {{ 'SIGN_IN_PROVIDER'| translate }}
       </legend>
       <div id="signin-hint" class="govuk-hint" style="color: black;">
-        {{ idpStatus == false ? 'A sign in provider gives users the option to use a different service to sign in. Sign in providers are set at an
-        organisational level. Any updates applied here will apply to all of your organisation’s users' : (idpStatus == true ? 'Users can only use a User ID and password to sign in. You may be able to allow additional sign-in methods in the future.' : '')}}
+        A sign in provider gives users the option to use a different service to sign in. Sign in providers are set at an
+        organisational level. Any updates applied here will apply to all of your organisation’s users
       </div>
       <span *ngIf="!isValid && submitted" id="group-error" class="govuk-error-message label-detail-text-gap">
         <span class="govuk-visually-hidden">{{ 'ERROR_PREFIX' | translate }}</span>

src/app/pages/manage-organisation/manage-organisation-profile/manage-organisation-profile.component.ts

@@ -45,7 +45,6 @@ export class ManageOrganisationProfileComponent extends BaseComponent implements
     changedIdpList: { id: number, enabled: boolean, connectionName: string, name: string }[] = [];
     ccsContactUrl: string = environment.uri.ccsContactUrl;
     schemeData: any[] = [];
-    public idpStatus = environment.appSetting.hideIDP
     public detailsData: any = [
         'Send messages to multiple contacts in your organisation. You can also send targeted communications to specific users.',
         "Manage information about your organisation's specific business locations. For instance, you can add details about your head office and additional sites to organise deliveries.",

src/app/pages/manage-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.html

@@ -291,9 +291,9 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
                                 {{ 'SIGN_IN_PROVIDER'| translate }}
                             </legend>
                             <span class="sign_in_prov">
-                                {{ idpStatus == false ? 'A sign in provider gives users the option to use a different service to sign in. Sign in
+                                A sign in provider gives users the option to use a different service to sign in. Sign in
                                 providers are set at an organisational level. To update the sign in providers for your
-                                Organisation’s users please go to Manage organisations' : (idpStatus == true ? 'You can only use a User ID and password to sign in. You may be able to use additional sign-in methods in the future.' : '')}}
+                                Organisation’s users please go to Manage organisations
                             </span>
                             <span id="group-error" class="govuk-error-message label-detail-text-gap"
                                 *ngIf="submitted && formGroup.hasError('identityProviderRequired')">

src/app/pages/manage-user/manage-user-add-single-user-detail/manage-user-add-single-user-detail.component.ts

@@ -27,7 +27,6 @@ import { FormBaseComponent } from 'src/app/components/form-base/form-base.compon
 import { SessionStorageKey } from 'src/app/constants/constant';
 import { PatternService } from 'src/app/shared/pattern.service';
 import { WrapperConfigurationService } from 'src/app/services/wrapper/wrapper-configuration.service';
-import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-manage-user-add-single-user-detail',
@@ -54,7 +53,6 @@ export class ManageUserAddSingleUserDetailComponent
   state: any;
   hasGroupViewPermission: boolean = false;
   mfaAdminValidationError: boolean = false;
-  public idpStatus = environment.appSetting.hideIDP
   public detailsData: any = [
     'Add additional security steps to make an account more secure. Additional security needs to be enabled for all admin users. This can be accessed using a personal or work digital device.',
     'Groups allow you to manage large numbers of users all at once. Roles can be applied to groups to organise user’s more efficiently and allow bulk access to relevant services where it is required.',

src/app/pages/user-profile/user-profile-component.ts

@@ -23,7 +23,6 @@ import { FormBaseComponent } from 'src/app/components/form-base/form-base.compon
 import { SessionStorageKey } from 'src/app/constants/constant';
 import { PatternService } from 'src/app/shared/pattern.service';
 import { isBoolean } from 'lodash';
-import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-user-profile',
@@ -117,14 +116,10 @@ export class UserProfileComponent extends FormBaseComponent implements OnInit {
     let user = await this.userService.getUser(this.userName).toPromise();
     if (user != null) {
       this.canChangePassword = user.detail.canChangePassword;
-      if(!environment.appSetting.hideIDP){
-        this.identityProviderDisplayName =
+      this.identityProviderDisplayName =
         user.detail.identityProviders
           ?.map((idp) => idp.identityProviderDisplayName)
           .join(',') || '';
-      }else {
-        this.identityProviderDisplayName = 'User ID and password'
-      }
       this.userGroups = user.detail.userGroups || [];
       this.userGroups = this.userGroups.filter(
         (group, index, self) =>

src/app/services/wrapper/wrapper-configuration.service.ts

@@ -31,16 +31,12 @@ export class WrapperConfigurationService {
     const url = `${this.url}/identity-providers`;
     return this.http.get<IdentityProvider[]>(url, this.options).pipe(
       map((data: IdentityProvider[]) => {
-        if(environment.appSetting.hideIDP){
           data.map((f: IdentityProvider) => {
-            if (f.name === 'User ID and password') {
-                tempData.push(f)
-            }
-        })
-           return tempData;
-        } else {
-          return data
-        }
+          if (f.name === 'User ID and password') {
+              tempData.push(f)
+          }
+      })
+         return tempData;
       }), catchError(error => {
         return throwError(error);
       })

src/environments/environment.ts

@@ -59,7 +59,5 @@ export const environment = {
       __cf_bm : 30 
     },
   },
-  appSetting: {
-    hideIDP:true,
-   },
 };
+