Merge branch 'ec-eric-emailAddress' into 'master'

Update afwerx emails to help.dsop.io and remove usused feedback section

See merge request platform-one/plugins/website-sso-information!30

p1-sso/package-lock.json

@@ -711,6 +711,16 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -2314,6 +2324,13 @@
         "object-assign": "^4.1.0"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -3723,6 +3740,13 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "dev": true,
+      "optional": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -5678,7 +5702,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",

p1-sso/src/public/announcements.html

@@ -22,7 +22,7 @@
                     <h2 class="section-heading" style="color: #52a1fd;">Announcement</h2>
                     <p>A critical bug was identified in the Mattermost mobile app version 1.33.0 that was released on Wednesday, 15 July. Certain YouTube links were causing the app to crash leaving users in a state where they can no longer access anything within the mobile app. The bug was submitted to the Mattermost mobile app development team and a fix was quickly identified which rolled out in the app release v1.33.1 on Thursday, 16 July.
                     <p>
-                    <p>Please ensure your Mattermost mobile app is updated to version 1.33.1. If you're still experiencing the issue after updating the app, you may need to delete the app and reinstall it. For any questions or if you need further assistance, email us at <a href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a>.
+                    <p>Please ensure your Mattermost mobile app is updated to version 1.33.1. If you're still experiencing the issue after updating the app, you may need to delete the app and reinstall it. For any questions or if you need further assistance, email us at <a href="mailto: help@dsop.io">help@dsop.io</a>.
                     </p>
                     <a href="https://apps.apple.com/us/app/mattermost/id1257222717"><img src="img/download_apple_store.png"></a>
 

p1-sso/src/public/index.html

@@ -246,20 +246,6 @@
                     </div>
 
                 </div>
-                <section id="feedback" class="feedback text-left"
-                    style="background-color: #040e16;height: none;min-height: auto;max-height: auto;max-width: auto;">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-8 mx-auto">
-                                <h2 class="section-heading" style="color: #52a1fd;">Feedback</h2>
-                                <p>We're always looking to improve our user experience. We would appreciate if you
-                                    could take a minute to fill out a quick survey to give us feedback by <a
-                                        href="https://airtable.com/shrcThgZSF8jKx3tB">clicking here.</a></p>
-                            </div>
-                        </div>
-                    </div>
-
-                </section>
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
                 <script
                     src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/js/bootstrap.bundle.min.js"></script>

p1-sso/src/public/reset_mfa.html

@@ -95,7 +95,7 @@
                             <li>If you've previously associated your CAC with the account, you can log in using CAC to
                                 follow the steps above.</li>
                             <li>If you don't have CAC access, email us at <a
-                                    href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a>
+                                    href="mailto: help@dsop.io">help@dsop.io</a>
                                 from an approved email address (e.g. @us.af.mil) to request an MFA reset.</li>
                         </div>
                     </div>

p1-sso/src/public/setup_p1sso.html

@@ -138,7 +138,7 @@
                             <br>
                         <h4>I've set up a new account and I'm getting an error message that says "There is already an account associated with that email address using a sign in method other than gitlab. Please sign in using SAML."</h4>
                         <li>How embarrasing, our automatic migration seems to have had an issue. Please contact as at <a
-                            href="mailto: dod_p1chat_admin@afwerx.af.mil">dod_p1chat_admin@afwerx.af.mil</a> to get this resolved.</li>
+                            href="mailto: help@dsop.io">help@dsop.io</a> to get this resolved.</li>
                     </div>
                 </div>
             </div>