Enable dynamic switch flag between local DB and UBC CWL SAML login vi…

ipeer-ubc-cwl-login/README.md → ipeer/README.md

@@ -7,24 +7,6 @@ This method relies on local database authentication, where users log in using a
 iPeer CakePHP's ACL system using AROs and ACOs was a traditional method of handling access control before modern auth methods like SAML, OAuth2 became common.
 
 
-![alt text](image-1.png)
-
-##  Quick Start
-
-``` bash
-git clone https://github.com/ubc/charts.git
-
-```
-
-### Default login:
-
-```bash
-
-cd ipeer
-
-helm install/upgrade -n default -f ./ipeer-stg-defaultlogin-values.yaml --atomic ipeer-stg ./charts/ipeer
-```
-
 -----------
 
 
@@ -59,9 +41,7 @@ This project provides:
 
 ⚠️ IMPORTANT: This solution makes zero modifications to the original iPeer CakePHP source code or its built-in Access Control List (ACL) system. The ACL continues to use AROs (Access Request Objects) and ACOs (Access Control Objects) to manage permissions and access control in a structured, hierarchical manner.
 
-
-
-![alt text](image-2.png)
+------------------
 
 ##  Quick Start
 
@@ -70,13 +50,38 @@ git clone https://github.com/ubc/charts.git
 
 ```
 
+### Modify flag for UBC CWL Login:
+
+This introduces a configurable flag ubccwlsaml in the ipeer-stg-values.yaml file to switch between UBC CWL SAML login and the Default iPeer database login. By setting or removing this flag, admin can easily control the authentication method without modifying the iPeer image. 
+
+![alt text](image-3.png)
+
+```bash
+
+
+vi ./ipeer-stg-values.yaml
+
+# To enable UBC CWL login, set the `ubccwlsaml` flag:
+#   Use: ipeer-stg-defaultlogin-values
+
+# To use the default iPeer database login, either:
+#   - Set the flag empty (`flag: `), or
+#   - Remove the `flag: ubccwlsaml` flag entirely
+
+# Apply the changes:
+helm install/upgrade -n default -f ./ipeer-stg-values.yaml --atomic ipeer-stg ./charts/ipeer
+
+
+```
+
+
 ### OneLogin SAML Integration for UBC CWL Authentication Login:
 
 ```bash
 
-cd ipeer-ubc-cwl-login
+cd ipeer
 
-helm install/upgrade -n default -f ./ipeer-stg-oneloginsaml-values.yaml --atomic ipeer-stg ./charts/ipeer-oneloginsaml
+helm install/upgrade -n default -f ./ipeer-stg-values.yaml --atomic ipeer-stg ./charts/ipeer
 ```
 
 ------------------

ipeer/iPeerCWLCharts/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v2
+name: ipeer-combined-chart
+description: Combined chart for managing multiple subcharts
+version: 1.0.0

ipeer/iPeerCWLCharts/README.md

@@ -0,0 +1,7 @@
+## Helm Charts for iPeer – OneLogin SAML:
+
+> helm upgrade ipeer-stg-cwl ./iPeerCWLCharts/charts/oneloginsaml -n default -f values_ipeer-stg-cwl.yaml --atomic
+
+## Helm Charts for iPeer:
+
+> helm upgrade ipeer-stg ./iPeerCWLCharts/charts/ipeer -n default -f ./values_ipeer-stg.yaml --atomic

ipeer/iPeerCWLCharts/charts/ipeer/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

ipeer-ubc-cwl-login/Chart.yaml → ipeer/iPeerCWLCharts/charts/ipeer/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: ipeer
-description: iPeer helm chart
+description: iPeer OneLoginSAML Hybrid Helm Chart
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.21
+version: 0.1.12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to