Skip to content

Commit

Permalink
Merge pull request #10505 from 18F/stages/rc-2024-04-25
Browse files Browse the repository at this point in the history
Deploy RC 375 to Production
  • Loading branch information
jmhooper authored Apr 25, 2024
2 parents 3cfbfd6 + 1d769f7 commit 0e5b481
Show file tree
Hide file tree
Showing 99 changed files with 1,615 additions and 1,362 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ gem 'faker'
gem 'faraday-retry'
gem 'foundation_emails'
gem 'good_job', '~> 3.0'
gem 'hashie', '~> 4.1'
gem 'http_accept_language'
gem 'identity-hostdata', github: '18F/identity-hostdata', tag: 'v3.4.3'
gem 'identity-logging', github: '18F/identity-logging', tag: 'v0.1.0'
Expand Down Expand Up @@ -74,7 +73,6 @@ gem 'scrypt'
gem 'simple_form', '>= 5.0.2'
gem 'stringex', require: false
gem 'strong_migrations', '>= 0.4.2'
gem 'subprocess', require: false
gem 'terminal-table', require: false
# until a release includes https://github.com/hallelujah/valid_email/pull/126
gem 'valid_email', '>= 0.1.3', github: 'hallelujah/valid_email', ref: '486b860'
Expand Down
4 changes: 0 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ GEM
thor (>= 0.14.1)
google-protobuf (3.24.4)
hashdiff (1.0.1)
hashie (4.1.0)
heapy (0.2.0)
thor
highline (2.1.0)
Expand Down Expand Up @@ -674,7 +673,6 @@ GEM
stringio (3.1.0)
strong_migrations (1.6.4)
activerecord (>= 5.2)
subprocess (1.5.5)
tableparser (1.0.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down Expand Up @@ -777,7 +775,6 @@ DEPENDENCIES
faraday-retry
foundation_emails
good_job (~> 3.0)
hashie (~> 4.1)
http_accept_language
i18n-tasks (~> 1.0)
identity-hostdata!
Expand Down Expand Up @@ -850,7 +847,6 @@ DEPENDENCIES
simplecov_json_formatter
stringex
strong_migrations (>= 0.4.2)
subprocess
tableparser
terminal-table
valid_email (>= 0.1.3)!
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ARTIFACT_DESTINATION_FILE ?= ./tmp/idp.tar.gz
lint_country_dialing_codes \
lint_erb \
lint_lockfiles \
lint_new_typescript_files \
lint_optimized_assets \
lint_tracker_events \
lint_yaml \
Expand Down Expand Up @@ -88,6 +89,8 @@ endif
make lint_yaml
@echo "--- lint Yarn workspaces ---"
make lint_yarn_workspaces
@echo "--- lint new TypeScript files ---"
make lint_new_typescript_files
@echo "--- lint lockfiles ---"
make lint_lockfiles
@echo "--- check assets are optimized ---"
Expand Down Expand Up @@ -133,6 +136,9 @@ lint_yarn_lock: package.json yarn.lock ## Lints the package.json and its lockfil

lint_lockfiles: lint_gemfile_lock lint_yarn_lock ## Lints to ensure lockfiles are in sync

lint_new_typescript_files:
scripts/enforce-typescript-files.mjs

lint_readme: README.md ## Lints README.md
(! git diff --name-only | grep "^README.md$$") || (echo "Error: Run 'make README.md' to regenerate the README.md"; exit 1)

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/frontend_log_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class FrontendLogController < ApplicationController
'IdV: Capture troubleshooting dismissed' => :idv_capture_troubleshooting_dismissed,
'IdV: consent checkbox toggled' => :idv_consent_checkbox_toggled,
'IdV: download personal key' => :idv_personal_key_downloaded,
'IdV: exit optional questions' => :idv_exit_optional_questions,
'IdV: front image added' => :idv_front_image_added,
'IdV: front image clicked' => :idv_front_image_clicked,
'IdV: Image capture failed' => :idv_image_capture_failed,
Expand Down Expand Up @@ -52,6 +51,7 @@ class FrontendLogController < ApplicationController
idv_sdk_error_before_init
idv_sdk_selfie_image_capture_closed_without_photo
idv_sdk_selfie_image_capture_failed
idv_sdk_selfie_image_capture_initialized
idv_sdk_selfie_image_capture_opened
idv_sdk_selfie_image_re_taken
idv_selfie_image_added
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/openid_connect/user_info_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ def show

def authenticate_identity_via_bearer_token
verifier = AccessTokenVerifier.new(request.env['HTTP_AUTHORIZATION'])
response = verifier.submit
response, identity = verifier.submit
analytics.openid_connect_bearer_token(**response.to_h)

if response.success?
@current_identity = verifier.identity
@current_identity = identity
else
render json: { error: verifier.errors[:access_token].join(' ') },
status: :unauthorized
Expand Down
4 changes: 4 additions & 0 deletions app/javascript/packages/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"name": "@18f/identity-assets",
"private": true,
"version": "1.0.0",
"exports": {
".": "./index.ts",
"./webpack-plugin": "./webpack-plugin.js"
},
"peerDependencies": {
"webpack": ">=5"
},
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/packages/build-sass/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Unreleased
## 3.1.0

### New Features

Expand Down
9 changes: 6 additions & 3 deletions app/javascript/packages/build-sass/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "@18f/identity-build-sass",
"version": "3.0.0",
"version": "3.1.0",
"private": false,
"description": "Stylesheet compilation utility with reasonable defaults and fast performance.",
"type": "module",
"engines": {
"node": ">= 18"
},
"bin": {
"build-sass": "./cli.js"
"build-sass": "cli.js"
},
"repository": {
"type": "git",
"url": "https://github.com/18f/identity-idp.git",
"url": "git+https://github.com/18f/identity-idp.git",
"directory": "app/javascript/packages/build-sass"
},
"files": [
Expand All @@ -21,6 +21,9 @@
"get-default-load-paths.js",
"get-error-sass-stack-paths.js"
],
"exports": {
".": "./index.js"
},
"license": "CC0-1.0",
"bugs": {
"url": "https://github.com/18f/identity-idp/issues"
Expand Down
49 changes: 0 additions & 49 deletions app/javascript/packages/components/checkbox.spec.tsx

This file was deleted.

74 changes: 0 additions & 74 deletions app/javascript/packages/components/checkbox.tsx

This file was deleted.

30 changes: 0 additions & 30 deletions app/javascript/packages/components/field-set.spec.tsx

This file was deleted.

21 changes: 0 additions & 21 deletions app/javascript/packages/components/field-set.tsx

This file was deleted.

4 changes: 0 additions & 4 deletions app/javascript/packages/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@ export { default as ProcessListItem } from './process-list/process-list-item';
export { default as SelectInput } from './select-input';
export { default as SpinnerDots } from './spinner-dots';
export { default as StatusPage } from './status-page';
export { default as Tag } from './tag';
export { default as TextInput } from './text-input';
export { default as TroubleshootingOptions } from './troubleshooting-options';
export { default as Checkbox } from './checkbox';
export { default as FieldSet } from './field-set';

export type { ButtonProps } from './button';
export type { FullScreenRefHandle } from './full-screen';
export type { LinkProps } from './link';
export type { TextInputProps } from './text-input';
export type { CheckboxProps } from './checkbox';
44 changes: 0 additions & 44 deletions app/javascript/packages/components/tag.spec.tsx

This file was deleted.

Loading

0 comments on commit 0e5b481

Please sign in to comment.