From f82bc0cbe03aa9801b3bafbb7c0d157f422ce84a Mon Sep 17 00:00:00 2001
From: mehab <meha.bhargava@citi.com>
Date: Thu, 6 Jul 2023 14:10:40 +0100
Subject: [PATCH 1/2] added changes to ui to support authentication for
 repositories regardless of whether they are for internal packages or not
 Co-authored-by:Sahiba Mittal <sahiba.mittal@citi.com>

Signed-off-by: mehab <meha.bhargava@citi.com>
---
 src/i18n/locales/en.json                      |  1 +
 .../repositories/Repositories.vue             | 23 +++++++++++++++++--
 .../RepositoryCreateRepositoryModal.vue       | 19 +++++++++++----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index c4dafad23..cfadda796 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -696,6 +696,7 @@
     "create_repository": "Create Repository",
     "repository_type": "Repository Type",
     "internal": "Internal",
+    "repository_authentication": "Authentication required",
     "delete_repository": "Delete Repository",
     "repository_created": "Repository created",
     "repository_deleted": "Repository deleted",
diff --git a/src/views/administration/repositories/Repositories.vue b/src/views/administration/repositories/Repositories.vue
index 752b1c282..d71f81ebf 100644
--- a/src/views/administration/repositories/Repositories.vue
+++ b/src/views/administration/repositories/Repositories.vue
@@ -89,6 +89,15 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
               return value === true ? '<i class="fa fa-check-square-o" />' : "";
             },
           },
+          {
+                      title: this.$t('admin.repository_authentication'),
+                      field: "authenticationRequired",
+                      class: "tight",
+                      sortable: true,
+                      formatter(value, row, index) {
+                        return value === true ? '<i class="fa fa-check-square-o" />' : "";
+                      },
+                    },
           {
             title: this.$t('admin.enabled'),
             field: "enabled",
@@ -134,13 +143,16 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                     <div>
                       <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
                     </div>
+                    <div>
+                     <c-switch color="primary" v-model="authenticationRequired" label v-bind="labelIcon" />{{$t('admin.repository_authentication')}}
+                    </div>
 
                     <div>
                       <b-validated-input-group-form-input
                         id="username" :label="$t('admin.username')"
                         input-group-size="mb-3"
                         v-model="username"
-                        v-show="internal"
+                        v-show="authenticationRequired"
                         v-debounce:750ms="updateRepository" :debounce-events="'keyup'"/>
                     </div>
 
@@ -148,8 +160,9 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                       <b-validated-input-group-form-input
                         id="password" :label="$t('admin.password')"
                         input-group-size="mb-3"
+                        type="password"
                         v-model="password"
-                        v-show="internal"
+                        v-show="authenticationRequired"
                         v-debounce:750ms="updateRepository" :debounce-events="'keyup'"/>
                     </div>
 
@@ -173,6 +186,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                   identifier: row.identifier,
                   url: row.url,
                   internal: row.internal,
+                  authenticationRequired: row.authenticationRequired,
                   username: row.username,
                   password: row.password || null,
                   enabled: row.enabled,
@@ -189,7 +203,11 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                 },
                 enabled() {
                   this.updateRepository();
+                },
+                authenticationRequired(){
+                this.updateRepository();
                 }
+
               },
               methods: {
                 deleteRepository: function() {
@@ -207,6 +225,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                     identifier: this.identifier,
                     url: this.url,
                     internal: this.internal,
+                    authenticationRequired: this.authenticationRequired,
                     username: this.username,
                     password: this.password || null,
                     enabled: this.enabled,
diff --git a/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue b/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue
index 05cf65110..e202f26be 100644
--- a/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue
+++ b/src/views/administration/repositories/RepositoryCreateRepositoryModal.vue
@@ -18,24 +18,30 @@
     <b-input-group-form-select id="input-repository-type" required="true"
                                v-model="repositoryType" :options="repositoryTypes"
                                :label="$t('admin.repository_type')" />
+
+    <div>
+          <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
+        </div>
     <div>
-      <c-switch color="primary" v-model="internal" label v-bind="labelIcon" />{{$t('admin.internal')}}
+      <c-switch color="primary" v-model="repository_authentication" label v-bind="labelIcon" />{{$t('admin.repository_authentication')}}
     </div>
-
-    <b-validated-input-group-form-input
+  <b-validated-input-group-form-input
           id="username"
           :label="$t('admin.username')"
           input-group-size="mb-3"
           v-model="username"
-          v-show="internal"
+          rules="required"
+          v-show="repository_authentication"
       />
 
       <b-validated-input-group-form-input
           id="password"
           :label="$t('admin.password')"
           input-group-size="mb-3"
+          type="password"
+          rules="required"
           v-model="password"
-          v-show="internal"
+          v-show="repository_authentication"
       />
 
     <div>
@@ -74,6 +80,7 @@ import BValidatedInputGroupFormInput from "../../../forms/BValidatedInputGroupFo
         repositoryType: null,
         initialRepositoryType: null,
         internal: false,
+        repository_authentication: false,
         username: null,
         password: null,
         enabled: true,
@@ -103,6 +110,7 @@ import BValidatedInputGroupFormInput from "../../../forms/BValidatedInputGroupFo
           identifier: this.identifier,
           url: this.url,
           internal: this.internal,
+          authenticationRequired: this.repository_authentication,
           username: this.username,
           password: this.password || null,
           enabled: this.enabled
@@ -124,6 +132,7 @@ import BValidatedInputGroupFormInput from "../../../forms/BValidatedInputGroupFo
         this.username = null;
         this.password = null;
         this.enabled = true;
+        this.repository_authentication = false;
       }
     }
   }

From fa607ce6e15bb4be6e25fcf550e06f1b530518ec Mon Sep 17 00:00:00 2001
From: mehab <meha.bhargava@citi.com>
Date: Thu, 6 Jul 2023 18:35:31 +0100
Subject: [PATCH 2/2] password required field changes

Signed-off-by: mehab <meha.bhargava@citi.com>
---
 src/views/administration/repositories/Repositories.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/administration/repositories/Repositories.vue b/src/views/administration/repositories/Repositories.vue
index d71f81ebf..94e8dc030 100644
--- a/src/views/administration/repositories/Repositories.vue
+++ b/src/views/administration/repositories/Repositories.vue
@@ -152,6 +152,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                         id="username" :label="$t('admin.username')"
                         input-group-size="mb-3"
                         v-model="username"
+                        rules="required"
                         v-show="authenticationRequired"
                         v-debounce:750ms="updateRepository" :debounce-events="'keyup'"/>
                     </div>
@@ -162,6 +163,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                         input-group-size="mb-3"
                         type="password"
                         v-model="password"
+                        rules="required"
                         v-show="authenticationRequired"
                         v-debounce:750ms="updateRepository" :debounce-events="'keyup'"/>
                     </div>
@@ -188,7 +190,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                   internal: row.internal,
                   authenticationRequired: row.authenticationRequired,
                   username: row.username,
-                  password: row.password || null,
+                  password: row.password || "HiddenDecryptedPropertyPlaceholder",
                   enabled: row.enabled,
                   uuid: row.uuid,
                   labelIcon: {
@@ -205,6 +207,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                   this.updateRepository();
                 },
                 authenticationRequired(){
+
                 this.updateRepository();
                 }
 
@@ -227,7 +230,7 @@ import RepositoryCreateRepositoryModal from "./RepositoryCreateRepositoryModal";
                     internal: this.internal,
                     authenticationRequired: this.authenticationRequired,
                     username: this.username,
-                    password: this.password || null,
+                    password: this.password || "HiddenDecryptedPropertyPlaceholder",
                     enabled: this.enabled,
                     uuid: this.uuid
                   }).then((response) => {