From 0ba8568f96a56639394cfeff1d4d49b1fc32792a Mon Sep 17 00:00:00 2001
From: Mike Finnessy <mfinnessy@caci.com>
Date: Thu, 17 Oct 2024 13:03:26 -0600
Subject: [PATCH] moved auth settings to its own security tab (#224)

---
 .../routes/authenticationconfigurations.js    |  4 ++--
 .../admin-authentication-create.component.ts  | 10 +++++-----
 .../admin-authentication.component.html       |  3 +++
 .../admin-authentication.component.ts         |  6 ++++++
 .../admin-settings.component.html             |  5 -----
 web-app/admin/src/ng1/admin/admin.tab.html    |  6 ++++++
 web-app/admin/src/ng1/app.js                  | 19 ++++++++++++++-----
 7 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/service/src/routes/authenticationconfigurations.js b/service/src/routes/authenticationconfigurations.js
index cdf239035..8f119dc6d 100644
--- a/service/src/routes/authenticationconfigurations.js
+++ b/service/src/routes/authenticationconfigurations.js
@@ -101,7 +101,7 @@ module.exports = function (app, security) {
 
       const securityData = {};
 
-      const settings = JSON.parse(req.body.settings);
+      const { settings } = req.body;
 
       Object.keys(settings).forEach(key => {
         if (blacklist && blacklist.indexOf(key.toLowerCase()) != -1) {
@@ -184,7 +184,7 @@ module.exports = function (app, security) {
 
       const securityData = {};
 
-      const settings = JSON.parse(req.body.settings);
+      const { settings } = req.body;
 
       Object.keys(settings).forEach(key => {
         if (blacklist && blacklist.indexOf(key.toLowerCase()) != -1) {
diff --git a/web-app/admin/src/app/admin/admin-authentication/admin-authentication-create/admin-authentication-create.component.ts b/web-app/admin/src/app/admin/admin-authentication/admin-authentication-create/admin-authentication-create.component.ts
index 60a2dd104..8393b7ca2 100644
--- a/web-app/admin/src/app/admin/admin-authentication/admin-authentication-create/admin-authentication-create.component.ts
+++ b/web-app/admin/src/app/admin/admin-authentication/admin-authentication-create/admin-authentication-create.component.ts
@@ -17,10 +17,10 @@ import { Strategy } from '../../admin-authentication/admin-settings.model';
 })
 export class AuthenticationCreateComponent implements OnInit {
    breadcrumbs: AdminBreadcrumb[] = [{
-      title: 'Settings',
-      icon: 'build',
+      title: 'Security',
+      icon: 'shield',
       state: {
-         name: 'admin.settings'
+         name: 'admin.security'
       }
    }];
    strategy: Strategy;
@@ -124,13 +124,13 @@ export class AuthenticationCreateComponent implements OnInit {
 
    save(): void {
       this.authenticationConfigurationService.createConfiguration(this.strategy).then(() => {
-         this.stateService.go('admin.settings');
+         this.stateService.go('admin.security');
       }).catch((err: any) => {
          console.error(err);
          this.snackBar.open('An error occured while creating ' + this.strategy.title, null, {
             duration: 2000,
          })
-         this.stateService.go('admin.settings');
+         this.stateService.go('admin.security');
       });
    }
 
diff --git a/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.html b/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.html
index 0141543ff..bb48b8f7f 100644
--- a/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.html
+++ b/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.html
@@ -1,3 +1,6 @@
+<section class="mat-typography">
+    <admin-breadcrumb [breadcrumbs]="breadcrumbs"></admin-breadcrumb>
+</section>
 <section class="mat-typography">
     <div class="auth__action--new">
         <button mat-stroked-button color="primary" (click)="$event.stopPropagation(); createAuthentication()"
diff --git a/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.ts b/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.ts
index 9ffaac392..2dbe426b8 100644
--- a/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.ts
+++ b/web-app/admin/src/app/admin/admin-authentication/admin-authentication.component.ts
@@ -1,6 +1,7 @@
 import _ from 'underscore'
 import { Component, OnInit, Inject, EventEmitter, Output, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Team, Event, LocalStorageService, AuthenticationConfigurationService, UserService } from '../../upgrade/ajs-upgraded-providers';
+import { AdminBreadcrumb } from '../admin-breadcrumb/admin-breadcrumb.model'
 import { Strategy } from '../admin-authentication/admin-settings.model';
 import { MatDialog } from '@angular/material/dialog';
 import { StateService } from '@uirouter/angular';
@@ -17,6 +18,11 @@ export class AdminAuthenticationComponent implements OnInit, OnChanges {
   @Output() onDirty = new EventEmitter<boolean>();
   @Input() beginSave: any;
 
+  readonly breadcrumbs: AdminBreadcrumb[] = [{
+    title: 'Security',
+    icon: 'shield'
+  }];
+
   teams: any[] = [];
   events: any[] = [];
 
diff --git a/web-app/admin/src/app/admin/admin-settings/admin-settings.component.html b/web-app/admin/src/app/admin/admin-settings/admin-settings.component.html
index ff249c343..ad15780e5 100644
--- a/web-app/admin/src/app/admin/admin-settings/admin-settings.component.html
+++ b/web-app/admin/src/app/admin/admin-settings/admin-settings.component.html
@@ -5,11 +5,6 @@
     <div class="page-container">
         <div class="content">
             <mat-tab-group color="primary" mat-stretch-tabs>
-                <mat-tab label="Authentication">
-                    <admin-authentication (saveComplete)="onAuthenticationSaved($event)"
-                        (onDirty)="onAuthenticationDirty($event)" (deleteComplete)="onAuthenticationDeleted($event)" [beginSave]="(onSave)">
-                    </admin-authentication>
-                </mat-tab>
                 <mat-tab label="Banner">
                     <security-banner (saveComplete)="onBannerSaved($event)" (onDirty)="onBannerDirty($event)"
                         [beginSave]="(onSave)"></security-banner>
diff --git a/web-app/admin/src/ng1/admin/admin.tab.html b/web-app/admin/src/ng1/admin/admin.tab.html
index 2702a62a6..dd3f9a433 100644
--- a/web-app/admin/src/ng1/admin/admin.tab.html
+++ b/web-app/admin/src/ng1/admin/admin.tab.html
@@ -58,6 +58,12 @@
       <div>Map</div>
     </div>
 
+    <div class="admin-action" ng-if="$ctrl.hasPermission('UPDATE_SETTINGS')" ng-class="{'admin-action-selected': $ctrl.stateName === 'admin.security'}" ng-click="$ctrl.tabChanged('admin.security')">
+      <div ng-class="{'admin-action-arrow-left': $ctrl.stateName === 'admin.security'}"></div>
+      <i class="fa fa-shield"></i>
+      <div>Security</div>
+    </div>
+
     <div class="admin-action" ng-if="$ctrl.hasPermission('UPDATE_SETTINGS')" ng-class="{'admin-action-selected': $ctrl.stateName === 'admin.settings'}" ng-click="$ctrl.tabChanged('admin.settings')">
       <div ng-class="{'admin-action-arrow-left': $ctrl.stateName === 'admin.settings'}"></div>
       <i class="fa fa-wrench"></i>
diff --git a/web-app/admin/src/ng1/app.js b/web-app/admin/src/ng1/app.js
index e5997b188..de2f57294 100644
--- a/web-app/admin/src/ng1/app.js
+++ b/web-app/admin/src/ng1/app.js
@@ -16,6 +16,7 @@ import { UserReadService } from '@ngageoint/mage.web-core-lib/user';
 import { ContactComponent } from '../app/contact/contact.component';
 
 import { AdminSettingsComponent } from '../app/admin/admin-settings/admin-settings.component';
+import { AdminAuthenticationComponent } from '../app/admin/admin-authentication/admin-authentication.component';
 import { AdminMapComponent } from '../app/admin/admin-map/admin-map.component';
 import { AdminFeedsComponent } from '../app/admin/admin-feeds/admin-feeds.component';
 import { AdminFeedComponent } from '../app/admin/admin-feeds/admin-feed/admin-feed.component';
@@ -58,6 +59,7 @@ app
   .directive('feedEdit', downgradeComponent({ component: AdminFeedEditComponent }))
   .directive('upgradedAdminMapSettings', downgradeComponent({ component: AdminMapComponent }))
   .directive('upgradedAdminSettings', downgradeComponent({ component: AdminSettingsComponent }))
+  .directive('upgradedAdminAuthentication', downgradeComponent({ component: AdminAuthenticationComponent }))
   .directive('authenticationCreate', downgradeComponent({ component: AuthenticationCreateComponent }))
   .directive('contact', downgradeComponent({ component: ContactComponent }))
   .directive('adminEventFormPreview', downgradeComponent({ component: AdminEventFormPreviewComponent }));
@@ -346,18 +348,25 @@ function config($httpProvider, $stateProvider, $urlRouterProvider, $animateProvi
     resolve: resolveAdmin()
   });
 
-  // Admin settings routes
-  $stateProvider.state('admin.settings', {
-    url: '/settings',
-    component: "upgradedAdminSettings",
+  // Security settings routes
+  $stateProvider.state('admin.security', {
+    url: '/security',
+    component: "upgradedAdminAuthentication",
     resolve: resolveAdmin()
   });
 
   $stateProvider.state('admin.authenticationCreate', {
-    url: '/settings/new',
+    url: '/security/new',
     component: "authenticationCreate",
     resolve: resolveAdmin()
   });
+
+  // Admin settings routes
+  $stateProvider.state('admin.settings', {
+    url: '/settings',
+    component: "upgradedAdminSettings",
+    resolve: resolveAdmin()
+  });
 }
 
 run.$inject = ['$rootScope', '$uibModal', '$state', 'Api'];