From 8096a94cb96a5575f09143f5ea3e73f45bcebc65 Mon Sep 17 00:00:00 2001 From: paulqualls Date: Wed, 7 Apr 2021 16:56:00 +0000 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b79c831..6fc2ca0e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Getting started: -```cd p1-sso && npm -i``` +```cd p1-sso && npm i``` Run p1-sso: -- GitLab From 84791083588ca7695085b6947bc4d0cf8de18aa0 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 7 Apr 2021 12:29:32 -0500 Subject: [PATCH 2/4] Update afwerx emails to help.dsop.io and remove usused feedback section --- p1-sso/package-lock.json | 30 +++++++++++++++++++++++++++- p1-sso/src/public/announcements.html | 2 +- p1-sso/src/public/index.html | 14 ------------- p1-sso/src/public/reset_mfa.html | 2 +- p1-sso/src/public/setup_p1sso.html | 2 +- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/p1-sso/package-lock.json b/p1-sso/package-lock.json index af18ae87..765ef781 100644 --- a/p1-sso/package-lock.json +++ b/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", diff --git a/p1-sso/src/public/announcements.html b/p1-sso/src/public/announcements.html index eb09b9f4..71a409d9 100644 --- a/p1-sso/src/public/announcements.html +++ b/p1-sso/src/public/announcements.html @@ -22,7 +22,7 @@

Announcement

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.

-

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 dod_p1chat_admin@afwerx.af.mil. +

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 help@dsop.io.

diff --git a/p1-sso/src/public/index.html b/p1-sso/src/public/index.html index 1e1b4ceb..8c085193 100644 --- a/p1-sso/src/public/index.html +++ b/p1-sso/src/public/index.html @@ -246,20 +246,6 @@ - diff --git a/p1-sso/src/public/reset_mfa.html b/p1-sso/src/public/reset_mfa.html index c10c47fd..bb546198 100644 --- a/p1-sso/src/public/reset_mfa.html +++ b/p1-sso/src/public/reset_mfa.html @@ -95,7 +95,7 @@
  • If you've previously associated your CAC with the account, you can log in using CAC to follow the steps above.
  • If you don't have CAC access, email us at dod_p1chat_admin@afwerx.af.mil + href="mailto: help@dsop.io">help@dsop.io from an approved email address (e.g. @us.af.mil) to request an MFA reset.
    • diff --git a/p1-sso/src/public/setup_p1sso.html b/p1-sso/src/public/setup_p1sso.html index 32b2ab37..168c6262 100644 --- a/p1-sso/src/public/setup_p1sso.html +++ b/p1-sso/src/public/setup_p1sso.html @@ -138,7 +138,7 @@

    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."

  • How embarrasing, our automatic migration seems to have had an issue. Please contact as at dod_p1chat_admin@afwerx.af.mil to get this resolved.
    • + href="mailto: help@dsop.io">help@dsop.io to get this resolved. -- GitLab From d23dc637bb4d82d96697eacc69d8ca0d38dad649 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 7 Apr 2021 12:39:40 -0500 Subject: [PATCH 3/4] Remove unused feedback test --- p1-sso/tests/cypress/p1SSO_home.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/p1-sso/tests/cypress/p1SSO_home.js b/p1-sso/tests/cypress/p1SSO_home.js index 608e0ddf..212ec0d7 100644 --- a/p1-sso/tests/cypress/p1SSO_home.js +++ b/p1-sso/tests/cypress/p1SSO_home.js @@ -37,9 +37,9 @@ describe ('Verify header links' , function(){ cy.contains('Create a new account') })*/ - it('Feedback', function() { - cy.get('#feedback').click - cy.get('#feedback > .container > .row > .col-md-8 > .section-heading').should('be.visible') + // it('Feedback', function() { + // cy.get('#feedback').click + // cy.get('#feedback > .container > .row > .col-md-8 > .section-heading').should('be.visible') - }) + // }) }) \ No newline at end of file -- GitLab From 2e087e46acd4b56dbf7c3e2bdc44ade9653296e4 Mon Sep 17 00:00:00 2001 From: Static Sites Deploy Bot Date: Wed, 7 Apr 2021 17:46:13 +0000 Subject: [PATCH 4/4] Deploying sso-info 1.2.7 to static sites hosting. --- sites/sso-info/announcements.html | 2 +- sites/sso-info/index.html | 14 -------------- sites/sso-info/reset_mfa.html | 2 +- sites/sso-info/setup_p1sso.html | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/sites/sso-info/announcements.html b/sites/sso-info/announcements.html index eb09b9f4..71a409d9 100644 --- a/sites/sso-info/announcements.html +++ b/sites/sso-info/announcements.html @@ -22,7 +22,7 @@

    Announcement

    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.

    -

    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 dod_p1chat_admin@afwerx.af.mil. +

    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 help@dsop.io.

    diff --git a/sites/sso-info/index.html b/sites/sso-info/index.html index 1e1b4ceb..8c085193 100644 --- a/sites/sso-info/index.html +++ b/sites/sso-info/index.html @@ -246,20 +246,6 @@ - diff --git a/sites/sso-info/reset_mfa.html b/sites/sso-info/reset_mfa.html index c10c47fd..bb546198 100644 --- a/sites/sso-info/reset_mfa.html +++ b/sites/sso-info/reset_mfa.html @@ -95,7 +95,7 @@
  • If you've previously associated your CAC with the account, you can log in using CAC to follow the steps above.
  • If you don't have CAC access, email us at dod_p1chat_admin@afwerx.af.mil + href="mailto: help@dsop.io">help@dsop.io from an approved email address (e.g. @us.af.mil) to request an MFA reset.
    • diff --git a/sites/sso-info/setup_p1sso.html b/sites/sso-info/setup_p1sso.html index 32b2ab37..168c6262 100644 --- a/sites/sso-info/setup_p1sso.html +++ b/sites/sso-info/setup_p1sso.html @@ -138,7 +138,7 @@

    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."

  • How embarrasing, our automatic migration seems to have had an issue. Please contact as at dod_p1chat_admin@afwerx.af.mil to get this resolved.
    • + href="mailto: help@dsop.io">help@dsop.io to get this resolved. -- GitLab