From 45f3a7c7743e331700c7e3bde94acbb3f6236b7d Mon Sep 17 00:00:00 2001 From: Danny Ortega Date: Tue, 22 Dec 2020 09:14:36 -0800 Subject: [PATCH 1/4] Fixed dsop.io urls to dso.mil --- p1-sso/src/public/index.html | 10 +++++----- p1-sso/src/public/invite_user.html | 2 +- p1-sso/src/public/new_account.html | 10 +++++----- p1-sso/src/public/reset_mfa.html | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/p1-sso/src/public/index.html b/p1-sso/src/public/index.html index ed83c9db..26e3a07e 100644 --- a/p1-sso/src/public/index.html +++ b/p1-sso/src/public/index.html @@ -94,7 +94,7 @@

Your account has been automatically migrated to P1 SSO. You will now use the "Platform One SSO" button to log in. If need also need the ability to log in without a CAC, you can set up a password and multi-factor authentication (MFA) on your account by going to https://login.dsop.io/ to access your + href="https://login.dso.mil/" target="_blank">https://login.dso.mil/ to access your profile. From here, click the "Password" tab to set a password. You will also need to click the "Authenticator" tab to set up multi-factor authentication (MFA).

@@ -107,7 +107,7 @@
  1. Insert CAC into the CAC reader. Ensure the lights stop flashing before continuing.
    2. -
  2. Navigate to https://login.dsop.io. +
  3. Navigate to https://login.dso.mil.
  4. You will be prompted to authenticate with the CAC. The first time you do @@ -118,7 +118,7 @@ a computer with a CAC, you will simply authenticate using the CAC.
  5. You may now navigate to https://chat.collab.cdl.af.mil or https://chat.il2.dsop.io for the appropriate + href="https://chat.il2.dso.mil">https://chat.il2.dso.mil for the appropriate chat server you are on, and should be automatically logged into MatterMost
  6. From now on when you click the Platform One SSO button to login to Mattermost it will attempt use CAC to authenticate if it is inserted. If not, it will require you to enter @@ -204,8 +204,8 @@

    7. How do I update my profile?

    -
  7. Log into your account at https://login.dsop.io which will bring you to your +
  8. Log into your account at https://login.dso.mil which will bring you to your account settings page where you will be able to update your profile.

    9. How does a new user create an account?

    diff --git a/p1-sso/src/public/invite_user.html b/p1-sso/src/public/invite_user.html index 6e6ec9ae..e27f4698 100644 --- a/p1-sso/src/public/invite_user.html +++ b/p1-sso/src/public/invite_user.html @@ -19,7 +19,7 @@

    Go Back

    Invitations for access to Mattermost are no longer supported.

    - See How to request access to Mattermost. + See How to request access to Mattermost.

    diff --git a/p1-sso/src/public/new_account.html b/p1-sso/src/public/new_account.html index 20b35ec7..a7937592 100644 --- a/p1-sso/src/public/new_account.html +++ b/p1-sso/src/public/new_account.html @@ -32,7 +32,7 @@

    Step 1

    -

    Click here to access the registration page. Fill out the registration form using an approved email address (e.g. work email) and click +

    Click here to access the registration page. Fill out the registration form using an approved email address (e.g. work email) and click "Register". If you're registering with a CAC, setting up a password is optional if you only want to access your account using a CAC.

    http://chat.il2.dsop.io.

    + the IL2 Mattermost instance, access it using http://chat.il2.dso.mil.

    Note: For the mobile app, select the purple "GitLab" button to log into P1 SSO. This is a known issue.


    I created an account using a CAC but didn't set up a password. How do I set it up now?

    -
  9. Log into your account at https://login.dsop.io/ to access your profile. From here, click +
  10. Log into your account at https://login.dso.mil/ to access your profile. From here, click the "Password" tab to set a password. You will also need to click the "Authenticator" tab to set up multi-factor authentication (MFA).
    11. diff --git a/p1-sso/src/public/reset_mfa.html b/p1-sso/src/public/reset_mfa.html index b6a10d83..c10c47fd 100644 --- a/p1-sso/src/public/reset_mfa.html +++ b/p1-sso/src/public/reset_mfa.html @@ -39,7 +39,7 @@

    Step 1

    -

    Log into your account at https://login.dsop.io/ and click +

    Log into your account at https://login.dso.mil/ and click the "Authenticator" tab.

    Date: Wed, 23 Dec 2020 14:59:38 +0000 Subject: [PATCH 2/4] Update .gitlab-ci.yml to fix bad folder ref --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51edd07a..e748b9d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ staging-mr: script: - echo 'running auto merge request for staging' - echo "Opening Merge request for ${GITLAB_USER_NAME}" - - cd src + - cd p1-sso tags: - p1 @@ -87,7 +87,7 @@ deploy-mr: script: - echo 'running auto merge request for master' - echo "Opening Merge request for ${GITLAB_USER_NAME}" - - cd src + - cd p1-sso tags: - p1 -- GitLab From bac0b6991276bedcf21466dc189776a61935f274 Mon Sep 17 00:00:00 2001 From: paulqualls Date: Tue, 6 Apr 2021 19:45:26 +0000 Subject: [PATCH 3/4] Changes from dsop.io to dso.mil --- .gitlab-ci.yml | 8 ++++---- p1-sso/README.md | 6 +++--- p1-sso/src/public/index.html | 7 +++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e748b9d7..5510f1d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: variables: SITE_NAME: sso-info OUTPUT_FOLDER: p1-sso/dist - DEPLOY_REPO: https://jdceanfa:${CI_STATIC_SITES_TOKEN}@repo1.dsop.io/platform-one/apps/static-sites.git + DEPLOY_REPO: https://ent-collab-bot:${CI_STATIC_SITES_TOKEN}@repo1.dso.mil/platform-one/apps/static-sites.git #cache: # key: ${CI_COMMIT_REF_SLUG} @@ -25,7 +25,7 @@ variables: # - /**/node_modules .job_template: - image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0 + image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0 stage: cypress e2e #artifacts: # when: always @@ -47,7 +47,7 @@ sso-info tests: - p1 code-ship: - image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0 + image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0 extends: .copy-site script: - echo 'code shipping to static-sites deployment' @@ -59,7 +59,7 @@ code-ship: - p1 publish-staging: - image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0 + image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0 extends: .copy-staging-site script: - echo 'Publishing build outputs to MR for staging pre-prod' diff --git a/p1-sso/README.md b/p1-sso/README.md index a6b7f8c0..057f97af 100644 --- a/p1-sso/README.md +++ b/p1-sso/README.md @@ -8,9 +8,9 @@ v1.0.5 - Minor info change for certain bases not working, migration date # How to merge changes into static sties 0. Download latest master (Clone first time, pull any other time) ->`git clone https://repo1.dsop.io/platform-one/plugins/website-sso-information.git` - Init the project and download dependencies (First time use) +>`git clone https://repo1.dso.mil/platform-one/plugins/website-sso-information.git` - Init the project and download dependencies (First time use) ->`git pull https://repo1.dsop.io/platform-one/plugins/website-sso-information.git` - Init the project and download dependencies (After first time use) +>`git pull https://repo1.dso.mil/platform-one/plugins/website-sso-information.git` - Init the project and download dependencies (After first time use) 1. Checkout new branch >`git checkout -b BRANCH-NAME` - Create new branch 2. Make and save changes @@ -28,7 +28,7 @@ v1.0.5 - Minor info change for certain bases not working, migration date >`npm i` - Init the project and download dependencies -NOTE - you may need to install cypress separately if `npm -i` doesn't install cypress for you: +NOTE - you may need to install cypress separately if `npm i` doesn't install cypress for you: ``` npm install cypress --save-dev diff --git a/p1-sso/src/public/index.html b/p1-sso/src/public/index.html index 26e3a07e..1e1b4ceb 100644 --- a/p1-sso/src/public/index.html +++ b/p1-sso/src/public/index.html @@ -116,9 +116,8 @@ (pictured below) which will associate it with your P1 SSO account. Now when you sign in from a computer with a CAC, you will simply authenticate using the CAC. -
  11. You may now navigate to https://chat.collab.cdl.af.mil or https://chat.il2.dso.mil for the appropriate +
  12. You may now navigate to https://chat.il4.dso.mil or + https://chat.il2.dso.mil for the appropriate chat server you are on, and should be automatically logged into MatterMost
  13. From now on when you click the Platform One SSO button to login to Mattermost it will attempt use CAC to authenticate if it is inserted. If not, it will require you to enter @@ -269,4 +268,4 @@ - \ No newline at end of file + -- GitLab From 6795a76d47c2dd742c54d3aa03323e3708e75913 Mon Sep 17 00:00:00 2001 From: Static Sites Deploy Bot Date: Tue, 6 Apr 2021 20:15:33 +0000 Subject: [PATCH 4/4] Deploying sso-info 1.2.5 to static sites hosting. --- sites/sso-info/index.html | 15 +++++++-------- sites/sso-info/invite_user.html | 2 +- sites/sso-info/new_account.html | 10 +++++----- sites/sso-info/reset_mfa.html | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sites/sso-info/index.html b/sites/sso-info/index.html index ed83c9db..1e1b4ceb 100644 --- a/sites/sso-info/index.html +++ b/sites/sso-info/index.html @@ -94,7 +94,7 @@

    Your account has been automatically migrated to P1 SSO. You will now use the "Platform One SSO" button to log in. If need also need the ability to log in without a CAC, you can set up a password and multi-factor authentication (MFA) on your account by going to https://login.dsop.io/ to access your + href="https://login.dso.mil/" target="_blank">https://login.dso.mil/ to access your profile. From here, click the "Password" tab to set a password. You will also need to click the "Authenticator" tab to set up multi-factor authentication (MFA).

    @@ -107,7 +107,7 @@
    1. Insert CAC into the CAC reader. Ensure the lights stop flashing before continuing.
      2. -
    2. Navigate to https://login.dsop.io. +
    3. Navigate to https://login.dso.mil.
    4. You will be prompted to authenticate with the CAC. The first time you do @@ -116,9 +116,8 @@ (pictured below) which will associate it with your P1 SSO account. Now when you sign in from a computer with a CAC, you will simply authenticate using the CAC.
      5. -
    5. You may now navigate to https://chat.collab.cdl.af.mil or https://chat.il2.dsop.io for the appropriate +
    6. You may now navigate to https://chat.il4.dso.mil or + https://chat.il2.dso.mil for the appropriate chat server you are on, and should be automatically logged into MatterMost
    7. From now on when you click the Platform One SSO button to login to Mattermost it will attempt use CAC to authenticate if it is inserted. If not, it will require you to enter @@ -204,8 +203,8 @@

      8. How do I update my profile?

      -
    8. Log into your account at https://login.dsop.io which will bring you to your +
    9. Log into your account at https://login.dso.mil which will bring you to your account settings page where you will be able to update your profile.

      10. How does a new user create an account?

      @@ -269,4 +268,4 @@ - \ No newline at end of file + diff --git a/sites/sso-info/invite_user.html b/sites/sso-info/invite_user.html index 6e6ec9ae..e27f4698 100644 --- a/sites/sso-info/invite_user.html +++ b/sites/sso-info/invite_user.html @@ -19,7 +19,7 @@

      Go Back

      Invitations for access to Mattermost are no longer supported.

      - See How to request access to Mattermost. + See How to request access to Mattermost.

    14. diff --git a/sites/sso-info/new_account.html b/sites/sso-info/new_account.html index 20b35ec7..a7937592 100644 --- a/sites/sso-info/new_account.html +++ b/sites/sso-info/new_account.html @@ -32,7 +32,7 @@

    Step 1

    -

    Click here to access the registration page. Fill out the registration form using an approved email address (e.g. work email) and click +

    Click here to access the registration page. Fill out the registration form using an approved email address (e.g. work email) and click "Register". If you're registering with a CAC, setting up a password is optional if you only want to access your account using a CAC.

    http://chat.il2.dsop.io.

    + the IL2 Mattermost instance, access it using http://chat.il2.dso.mil.

    Note: For the mobile app, select the purple "GitLab" button to log into P1 SSO. This is a known issue.


    I created an account using a CAC but didn't set up a password. How do I set it up now?

    -
  14. Log into your account at https://login.dsop.io/ to access your profile. From here, click +
  15. Log into your account at https://login.dso.mil/ to access your profile. From here, click the "Password" tab to set a password. You will also need to click the "Authenticator" tab to set up multi-factor authentication (MFA).
    16. diff --git a/sites/sso-info/reset_mfa.html b/sites/sso-info/reset_mfa.html index b6a10d83..c10c47fd 100644 --- a/sites/sso-info/reset_mfa.html +++ b/sites/sso-info/reset_mfa.html @@ -39,7 +39,7 @@

    Step 1

    -

    Log into your account at https://login.dsop.io/ and click +

    Log into your account at https://login.dso.mil/ and click the "Authenticator" tab.