Skip to content

Commit 1fc84ca

Browse files
authored
Merge branch 'master' into 103296-update-uploads-controller-unit-tests
2 parents 2b0813a + 9ade68e commit 1fc84ca

File tree

29 files changed

+1175
-66
lines changed

29 files changed

+1175
-66
lines changed

.github/CODEOWNERS

+3-1
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,7 @@ config/form_profile_mappings/FORM-MOCK-AE-DESIGN-PATTERNS.yml @department-of-vet
746746
config/form_profile_mappings/MDOT.yml @department-of-veterans-affairs/va-cto-health-products @department-of-veterans-affairs/backend-review-group
747747
config/freshclam.conf @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
748748
config/health_care_application @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
749+
config/identity_settings @department-of-veterans-affairs/octo-identity
749750
config/imagemagick/policies/new-policy.xml @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
750751
config/initializers/01_redis.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
751752
config/initializers/aal.rb @department-of-veterans-affairs/octo-identity
@@ -771,6 +772,7 @@ config/initializers/flipper.rb @department-of-veterans-affairs/va-api-engineers
771772
config/initializers/freeze_schemas.rb @department-of-veterans-affairs/vfs-10-10 @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
772773
config/initializers/httpi.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
773774
config/initializers/ial.rb @department-of-veterans-affairs/octo-identity
775+
config/initializers/identity_config.rb @department-of-veterans-affairs/octo-identity
774776
config/initializers/inflections.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
775777
config/initializers/integration_recorder.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
776778
config/initializers/jsonapi_serializer_blank_id_patch.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
@@ -2237,4 +2239,4 @@ spec/uploaders/simple_forms_api/ @department-of-veterans-affairs/platform-va-pro
22372239
spec/uploaders/supporting_evidence_attachment_uploader_spec.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
22382240
spec/uploaders/uploader_virus_scan_spec.rb @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
22392241
spec/uploaders/validate_pdf_spec.rb @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
2240-
# Place your entry above this comment in alphabetical order.
2242+
# Place your entry above this comment in alphabetical order.

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ test_users.csv
9393
**/.DS_STORE
9494

9595
# Ignore VIM/vscode artifact files
96-
.ignore
96+
.ignore
9797
*.swp
9898
.vscode
9999

@@ -116,3 +116,6 @@ staging.benefits_claims.pem
116116

117117
# ignore Yardoc generation
118118
.yardoc/
119+
120+
# ignore all local settings files
121+
**/*.local.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
idme:
2+
client_cert_path: /srv/vets-api/secret/sign-in-service-oauth-lowers.pem
3+
client_id: dde0b5b8bfc023a093830e64ef83f148
4+
client_key_path: /srv/vets-api/secret/sign-in-service-oauth-lowers-key.pem
5+
redirect_uri: https://dev-api.va.gov/v0/sign_in/callback
6+
7+
logingov:
8+
client_cert_path: /srv/vets-api/secret/sign-in-service-oauth-lowers.pem
9+
client_key_path: /srv/vets-api/secret/sign-in-service-oauth-lowers-key.pem
10+
logout_redirect_uri: https://dev-api.va.gov/v0/sign_in/logingov_logout_proxy
11+
oauth_public_key: /srv/vets-api/secret/logingov_oauth_pub.pem
12+
redirect_uri: https://dev-api.va.gov/v0/sign_in/callback
13+
14+
map_services:
15+
client_cert_path: /srv/vets-api/secret/mobile-application-platform-lowers.pem
16+
client_key_path: /srv/vets-api/secret/mobile-application-platform-lowers-key.pem
17+
18+
mhv:
19+
account_creation:
20+
sts:
21+
issuer: https://dev-api.va.gov
22+
service_account_id: e2386c6ec816c44ddcb82e21fe730cb2
23+
24+
mvi:
25+
client_cert_path: /etc/pki/tls/certs/vetsgov-mvi-cert.pem
26+
client_key_path: /etc/pki/tls/private/vetsgov-mvi.key
27+
url: https://fwdproxy-dev.vfs.va.gov:4434/psim_webservice/dev/IdMWebService
28+
29+
saml_ssoe:
30+
callback_url: https://dev-api.va.gov/v1/sessions/callback
31+
cert_path: /srv/vets-api/secret/vagov-ssoe-saml-dev-cert.pem
32+
idp_metadata_file: /app/config/ssoe_idp_int_metadata_isam.xml
33+
issuer: https://ssoe-sp-dev.va.gov
34+
key_path: /srv/vets-api/secret/vagov-ssoe-saml-dev-key.pem
35+
logout_url: https://int.eauth.va.gov/slo/globallogout?appKey=https%253A%252F%252Fssoe-sp-dev.va.gov
36+
request_signing: true
37+
response_encryption: true
38+
response_signing: true
39+
tou_decline_logout_app_key: https://ssoe-sp-dev.va.gov/agreements_declined
40+
41+
session_cookie:
42+
secure: true
43+
44+
sign_in:
45+
cookies_secure: true
46+
info_cookie_domain: va.gov
47+
jwt_encode_key: /srv/vets-api/secret/sign-in-service-token-signing-lowers-key.pem
48+
jwt_old_encode_key: /srv/vets-api/secret/sign-in-service-token-signing-lowers-key-old.pem
49+
mock_auth_url: https://dev-api.va.gov/mocked_authentication/profiles
50+
mock_redirect_uri: https://dev-api.va.gov/v0/sign_in/callback
51+
sts_client:
52+
base_url: https://dev-api.va.gov
53+
key_path: /srv/vets-api/secret/sign-in-service-sts-client.pem
54+
55+
ssoe_eauth_cookie:
56+
domain: .va.gov
57+
name: vagov_saml_request_dev
58+
secure: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
idme:
2+
client_secret: ae657fd2b253d17be7b48ecdb39d7b34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
idme:
2+
client_cert_path: /srv/vets-api/secret/sign-in-service-oauth-prod.pem
3+
client_id: 4b0e5276cea986f6cd2525be1ab788f7
4+
client_key_path: /srv/vets-api/secret/sign-in-service-oauth-prod-key.pem
5+
oauth_url: https://api.id.me
6+
redirect_uri: https://api.va.gov/v0/sign_in/callback
7+
8+
logingov:
9+
client_cert_path: /srv/vets-api/secret/sign-in-service-oauth-prod.pem
10+
client_id: https://eauth.va.gov/isam/sps/saml20sp/saml20
11+
client_key_path: /srv/vets-api/secret/sign-in-service-oauth-prod-key.pem
12+
logout_redirect_uri: https://api.va.gov/v0/sign_in/logingov_logout_proxy
13+
oauth_public_key: /srv/vets-api/secret/logingov_oauth_prod_pub.pem
14+
oauth_url: https://secure.login.gov
15+
redirect_uri: https://api.va.gov/v0/sign_in/callback
16+
17+
map_services:
18+
appointments_client_id: 3cf08c719c8c69eb
19+
chatbot_client_id: 2bb9803acfc3
20+
check_in_client_id: bc75b71c7e67
21+
client_cert_path: /srv/vets-api/secret/mobile-application-platform-prod.pem
22+
client_key_path: /srv/vets-api/secret/mobile-application-platform-prod-key.pem
23+
oauth_url: https://veteran.apps.va.gov
24+
secure_token_service:
25+
mock: false
26+
sign_up_service:
27+
mock: false
28+
sign_up_service_client_id: c7d6e0fc9a39
29+
sign_up_service_url: https://staff.apps.va.gov
30+
31+
mhv:
32+
account_creation:
33+
host: https://apigw.myhealth.va.gov
34+
mock: false
35+
sts:
36+
issuer: https://api.va.gov
37+
service_account_id: e23aebb01255a8a157691d43ab7d5bcd
38+
39+
mvi:
40+
client_cert_path: /etc/pki/tls/certs/vetsgov-mvi-prod-cert.pem
41+
client_key_path: /etc/pki/tls/private/vetsgov-mvi.key
42+
processing_code: P
43+
url: https://fwdproxy-prod.vfs.va.gov:4434/psim_webservice/IdMWebService
44+
45+
saml_ssoe:
46+
callback_url: https://api.va.gov/v1/sessions/callback
47+
cert_path: /srv/vets-api/secret/vagov-ssoe-saml-prod-cert.pem
48+
idp_metadata_file: /app/config/ssoe_idp_prod_metadata_isam.xml
49+
issuer: https://ssoe-sp-prod.va.gov
50+
key_path: /srv/vets-api/secret/vagov-ssoe-saml-prod-key.pem
51+
logout_url: https://eauth.va.gov/slo/globallogout?appKey=https%253A%252F%252Fssoe-sp-prod.va.gov
52+
request_signing: true
53+
response_encryption: true
54+
response_signing: true
55+
tou_decline_logout_app_key: https://ssoe-sp-prod.va.gov/agreements_declined
56+
57+
session_cookie:
58+
secure: true
59+
60+
sign_in:
61+
arp_client_id: fe0d4b2cac7935e7eec5946b8ee31643
62+
cookies_secure: true
63+
info_cookie_domain: va.gov
64+
jwt_encode_key: /srv/vets-api/secret/sign-in-service-token-signing-prod-key.pem
65+
jwt_old_encode_key: /srv/vets-api/secret/sign-in-service-token-signing-prod-key-old.pem
66+
sts_client:
67+
base_url: https://api.va.gov
68+
key_path: /srv/vets-api/secret/sign-in-service-sts-client.pem
69+
web_origins:
70+
- https://identity.va.gov
71+
- https://staging.identity.va.gov
72+
- https://sandbox.identity.va.gov
73+
- https://dev.identity.va.gov
74+
75+
ssoe_eauth_cookie:
76+
domain: .va.gov
77+
name: vagov_saml_request_prod
78+
secure: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
idme:
2+
client_cert_path: /srv/vets-api/secret/sign-in-service-oauth-lowers.pem
3+
client_id: dde0b5b8bfc023a093830e64ef83f148
4+
client_key_path: /srv/vets-api/secret/sign-in-service-oauth-lowers-key.pem
5+
redirect_uri: https://staging-api.va.gov/v0/sign_in/callback
6+
7+
logingov:
8+
client_cert_path: /srv/vets-api/secret/sign-in-service-oauth-lowers.pem
9+
client_key_path: /srv/vets-api/secret/sign-in-service-oauth-lowers-key.pem
10+
logout_redirect_uri: https://staging-api.va.gov/v0/sign_in/logingov_logout_proxy
11+
oauth_public_key: /srv/vets-api/secret/logingov_oauth_pub.pem
12+
redirect_uri: https://staging-api.va.gov/v0/sign_in/callback
13+
14+
map_services:
15+
client_cert_path: /srv/vets-api/secret/mobile-application-platform-lowers.pem
16+
client_key_path: /srv/vets-api/secret/mobile-application-platform-lowers-key.pem
17+
secure_token_service:
18+
mock: false
19+
sign_up_service:
20+
mock: false
21+
22+
mhv:
23+
account_creation:
24+
mock: false
25+
sts:
26+
issuer: https://staging-api.va.gov
27+
service_account_id: 59d4a3199f42179e510e867cc786d8ac
28+
29+
mvi:
30+
client_cert_path: /etc/pki/tls/certs/vetsgov-mvi-cert.pem
31+
client_key_path: /etc/pki/tls/private/vetsgov-mvi.key
32+
url: https://fwdproxy-staging.vfs.va.gov:4434/psim_webservice/stage1a/IdMWebService
33+
34+
saml_ssoe:
35+
callback_url: https://staging-api.va.gov/v1/sessions/callback
36+
cert_path: /srv/vets-api/secret/vagov-ssoe-saml-staging-cert.pem
37+
idp_metadata_file: /app/config/ssoe_idp_int_metadata_isam.xml
38+
issuer: https://ssoe-sp-staging.va.gov
39+
key_path: /srv/vets-api/secret/vagov-ssoe-saml-staging-key.pem
40+
logout_url: https://sqa.eauth.va.gov/slo/globallogout?appKey=https%253A%252F%252Fssoe-sp-staging.va.gov
41+
request_signing: true
42+
response_encryption: true
43+
response_signing: true
44+
tou_decline_logout_app_key: https://ssoe-sp-staging.va.gov/agreements_declined
45+
46+
session_cookie:
47+
secure: true
48+
49+
sign_in:
50+
arp_client_id: ce6db4d7974daf061dccdd21ba9add14
51+
cookies_secure: true
52+
info_cookie_domain: va.gov
53+
jwt_encode_key: /srv/vets-api/secret/sign-in-service-token-signing-lowers-key.pem
54+
sts_client:
55+
base_url: https://staging-api.va.gov
56+
key_path: /srv/vets-api/secret/sign-in-service-sts-client.pem
57+
vamobile_client_id:
58+
- vamobile
59+
- vamobile_test
60+
61+
ssoe_eauth_cookie:
62+
domain: .va.gov
63+
name: vagov_saml_request_staging
64+
secure: true

config/identity_settings/settings.yml

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
audit_db:
2+
url: ~
3+
4+
idme:
5+
client_cert_path: spec/fixtures/sign_in/oauth.crt
6+
client_id: ef7f1237ed3c396e4b4a2b04b608a7b1
7+
client_key_path: spec/fixtures/sign_in/oauth.key
8+
client_secret: ~
9+
oauth_url: https://api.idmelabs.com
10+
redirect_uri: http://localhost:3000/v0/sign_in/callback
11+
12+
logingov:
13+
client_cert_path: spec/fixtures/sign_in/oauth.crt
14+
client_id: https://sqa.eauth.va.gov/isam/sps/saml20sp/saml20
15+
client_key_path: spec/fixtures/sign_in/oauth.key
16+
logout_redirect_uri: http://localhost:3000/v0/sign_in/logingov_logout_proxy
17+
oauth_public_key: spec/fixtures/logingov/logingov_oauth_pub.pem
18+
oauth_url: https://idp.int.identitysandbox.gov
19+
redirect_uri: http://localhost:3000/v0/sign_in/callback
20+
21+
map_services:
22+
appointments_client_id: 74b3145e1354555e
23+
chatbot_client_id: 2bb9803acfc3
24+
check_in_client_id: bc75b71c7e67
25+
client_cert_path: spec/fixtures/map/oauth.crt
26+
client_key_path: spec/fixtures/map/oauth.key
27+
oauth_url: https://veteran.apps-staging.va.gov
28+
secure_token_service:
29+
mock: true
30+
sign_up_service:
31+
mock: true
32+
sign_up_service_client_id: c7d6e0fc9a39
33+
sign_up_service_provisioning_api_key: ~
34+
sign_up_service_url: https://cerner.apps-staging.va.gov
35+
36+
mhv:
37+
account_creation:
38+
access_key: ~
39+
host: https://apigw-intb.aws.myhealth.va.gov
40+
mock: true
41+
sts:
42+
issuer: http://localhost:3000
43+
service_account_id: c34b86f2130ff3cd4b1d309bc09d8740
44+
45+
mvi:
46+
client_cert_path: /fake/client/cert/path
47+
client_key_path: /fake/client/key/path
48+
mock: false
49+
open_timeout: 15
50+
pii_logging: false
51+
processing_code: T
52+
timeout: 30
53+
url: http://ps-dev.commserv.healthevet.va.gov:8110/psim_webservice/IdMWebService
54+
55+
saml_ssoe:
56+
callback_url: http://localhost:3000/v1/sessions/callback
57+
cert_path: spec/support/certificates/ruby-saml.crt
58+
idp_metadata_file: config/ssoe_idp_int_metadata_isam.xml
59+
idp_sso_service_binding: urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST
60+
issuer: https://ssoe-sp-localhost.va.gov
61+
key_path: spec/support/certificates/ruby-saml.key
62+
logout_app_key: https://ssoe-sp-dev.va.gov
63+
logout_url: https://int.eauth.va.gov/slo/globallogout
64+
request_signing: false
65+
response_encryption: false
66+
response_signing: false
67+
tou_decline_logout_app_key: https://dev-api.va.gov/agreements_declined
68+
69+
session_cookie:
70+
secure: false
71+
72+
sign_in:
73+
arp_client_id: arp
74+
auto_uplevel: true
75+
cookies_secure: false
76+
info_cookie_domain: localhost
77+
jwt_encode_key: spec/fixtures/sign_in/privatekey.pem
78+
jwt_old_encode_key: spec/fixtures/sign_in/privatekey_old.pem
79+
mock_auth_url: http://localhost:3000/mocked_authentication/profiles
80+
mock_redirect_uri: http://localhost:3000/v0/sign_in/callback
81+
mockdata_sync_api_key: ~
82+
sts_client:
83+
base_url: http://localhost:3000
84+
key_path: spec/fixtures/sign_in/sts_client.pem
85+
user_info_clients:
86+
- okta_test
87+
vaweb_client_id: vaweb
88+
vamobile_client_id: vamobile
89+
web_origins:
90+
- http://localhost:4000
91+
92+
ssoe_eauth_cookie:
93+
domain: localhost
94+
name: vagov_saml_request_localhost
95+
secure: false
96+
97+
terms_of_use:
98+
current_version: v1
99+
enabled_clients: vaweb, mhv, myvahealth
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# frozen_string_literal: true
2+
3+
identity_settings_files = Config.setting_files(Rails.root.join('config', 'identity_settings'), Settings.vsp_environment)
4+
5+
IdentitySettings = Config.load_files(identity_settings_files)

modules/accredited_representative_portal/app/services/accredited_representative_portal/power_of_attorney_request_service/accept.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ def call
3535
@resolution = poa_request.mark_accepted!(creator, reason)
3636
end
3737
response = service.submit2122(form_payload)
38-
create_form_submission!(response.body)
39-
# TODO: call PowerOfAttorneyFormSubmissionJob.perform_async(form_submission)
38+
form_submission = create_form_submission!(response.body)
39+
PowerOfAttorneyFormSubmissionJob.perform_async(form_submission.id)
40+
form_submission
4041
# Invalid record - return error message with 400
4142
rescue ActiveRecord::RecordInvalid => e
4243
raise Error.new(e.message, :bad_request)
@@ -46,7 +47,6 @@ def call
4647
raise Error.new(e.message, BenefitsClaims::ServiceException::ERROR_MAP.invert[e.class])
4748
# Fatal 4xx errors or validation error: save error message, raise FatalError
4849
rescue *FATAL_ERROR_TYPES => e
49-
resolution&.delete
5050
create_error_form_submission(e.message, response&.body)
5151
raise Error.new(e.message, BenefitsClaims::ServiceException::ERROR_MAP.invert[e.class])
5252
# All other errors: save error data on form submission, will result in a 500

0 commit comments

Comments
 (0)