Merge pull request #561 from 18F/develop

Release 07/16/2018

.circleci/config.yml

@@ -17,7 +17,7 @@ jobs:
           command: make test
       - run:
           name: Code coverage
-          command: ./bin/coverage
+          command: make coverage
 
   cloudgov:
     machine: true

.dockerignore

@@ -0,0 +1,8 @@
+**/node_modules/
+coverage/
+
+/jest*
+/specs/reports
+/specs/screenshots
+/specs/tmp-*/
+

.env.aws.dev

@@ -3,5 +3,4 @@ GOLANG_ENV=development
 DOCKER_TAG=development
 SAML_ENABLED=1
 API_BASE_URL=https://api.nbis-test.com
-DISABLE_2FA=1
 ATTACHMENTS_ENABLED=

.env.aws.production

@@ -3,5 +3,4 @@ GOLANG_ENV=production
 DOCKER_TAG=production
 SAML_ENABLED=1
 API_BASE_URL=https://api.nbis-test.com
-DISABLE_2FA=1
 ATTACHMENTS_ENABLED=

.env.aws.staging

@@ -3,5 +3,4 @@ GOLANG_ENV=development
 DOCKER_TAG=test
 SAML_ENABLED=1
 API_BASE_URL=https://api.nbis-test.com
-DISABLE_2FA=1
 ATTACHMENTS_ENABLED=

.env.dev

@@ -2,19 +2,7 @@ NODE_ENV=staging
 GOLANG_ENV=development
 CORS_ALLOWED=https://eqip-prototype-dev.fr.cloud.gov
 BASIC_ENABLED=1
-SAML_ENABLED=
 API_REDIRECT=https://eqip-prototype-dev.fr.cloud.gov
 API_BASE_URL=https://eqip-prototype-api-dev.fr.cloud.gov
-HASH_ROUTING=
-ALLOW_2FA_RESET=1
-DISABLE_2FA=1
-FLUSH_STORAGE=1
-WS_ENABLED=1
-WS_URL=
-WS_KEY=
-WS_CALLERINFO_AGENCY_ID=
-WS_CALLERINFO_AGENCY_USER_PSEUDOSSN=
-WS_CALLERINFO_AGENCY_USER_SSN=
-WS_AGENCY_ID=
-WS_AGENCY_GROUP_ID=
-ATTACHMENTS_ENABLED=1
+ATTACHMENTS_ENABLED=
+WS_ENABLED=0

.env.example

@@ -5,8 +5,8 @@ LOG_FILE=
 LOG_SYSLOG=
 LOG_SYSLOG_CERT=
 SESSION_TIMEOUT=
-API_REDIRECT=
-API_BASE_URL=
+API_REDIRECT=http://localhost:8080
+API_BASE_URL=http://localhost:3000
 PORT=
 HASH_ROUTING=
 DB_MIGRATION_TARGET=
@@ -21,16 +21,13 @@ USPS_API_API_KEY=
 JWT_SECRET=
 BASIC_ENABLED=1
 SAML_ENABLED=
-SAML_PUBLIC_CERT=
-SAML_PRIVATE_CERT=
-SAML_IDP_SSO_URL=
-SAML_IDP_SSO_DESC_URL=
-SAML_IDP_PUBLIC_CERT=
-SAML_SIGN_REQUEST=
-SAML_CONSUMER_SERVICE_URL=
-DISABLE_2FA=1
-ALLOW_2FA_RESET=
-WINDOW_SIZE=
+SAML_PUBLIC_CERT=eapp.crt
+SAML_PRIVATE_CERT=eapp.key
+SAML_IDP_SSO_URL=https://localhost:9443/samlsso
+SAML_IDP_SSO_DESC_URL=localhost
+SAML_IDP_PUBLIC_CERT=wso2.crt
+SAML_SIGN_REQUEST=1
+SAML_CONSUMER_SERVICE_URL=http://localhost:3000/auth/saml/callback
 TLS_CERT=
 TLS_KEY=
 WS_URL=

.env.production

@@ -4,6 +4,5 @@ CORS_ALLOWED=https://eqip-prototype.fr.cloud.gov
 BASIC_ENABLED=1
 API_REDIRECT=https://eqip-prototype.fr.cloud.gov
 API_BASE_URL=https://eqip-prototype-api.fr.cloud.gov
-DISABLE_2FA=1
 ATTACHMENTS_ENABLED=
-WS_ENABLED=
+WS_ENABLED=

.env.staging

@@ -5,8 +5,6 @@ CORS_ALLOWED=https://eqip-prototype-staging.fr.cloud.gov
 API_REDIRECT=https://eqip-prototype-staging.fr.cloud.gov
 API_BASE_URL=https://eqip-prototype-api-staging.fr.cloud.gov
 HASH_ROUTING=
-ALLOW_2FA_RESET=1
-DISABLE_2FA=
 FLUSH_STORAGE=1
 BASIC_ENABLED=1
 SAML_ENABLED=1

.env.test

@@ -2,7 +2,6 @@ NODE_ENV=test
 CORS_ALLOWED=*
 BASIC_ENABLED=1
 API_BASE_URL=
-ALLOW_2FA_RESET=1
 HASH_ROUTING=
 FLUSH_STORAGE=1
 SAML_PUBLIC_CERT=/go/src/github.com/18F/e-QIP-prototype/api/eapp.crt

.eslintrc

@@ -1,22 +1,35 @@
 {
-  "extends": "standard",
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
   "env": {
-      "jest": true
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "jest": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 9,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
   },
   "plugins": [
-      "standard",
-      "promise",
-      "react"
+    "react"
   ],
-  "rules" : {
-    "react/jsx-uses-vars" : 1,
-		"indent": [
-		  "error",
-			2,
-			{
-			  "SwitchCase": 0,
-				"ImportDeclaration": "first"
-			}
-		]
+  "rules": {
+    "no-console": "off",
+    "no-unused-vars": "off",
+    "react/no-deprecated": "off",
+    "react/no-string-refs": "off",
+    "react/display-name": "off",
+    "react/prop-types": [
+      "error",
+      {
+        "skipUndeclared": true
+      }
+    ]
   }
 }

.gitignore

@@ -30,8 +30,10 @@ coverage
 build/Release
 
 # Dependency directories
-# node_modules
+node_modules
 jspm_packages
+vendor
+package-lock.json
 
 # Optional npm cache directory
 .npm
@@ -54,15 +56,13 @@ __snapshots__/
 # Build artifacts
 .gitmessage
 .projectile
-/bin
-/api/bin
+/.cache-loader/
 /api/dist
 /api/checksum
 /api/api
 /api/eapp-seccomp.json
 /api/cmd/server/server
 /api/cmd/flush/flush
-/api/cmd/reset/reset
 /api/cmd/unlock/unlock
 /api/cmd/fuzzer/fuzzer
 /api/cmd/load/load
@@ -82,11 +82,13 @@ TAGS
 *.cer
 *.crt
 *.key
+xmlsec1
 
 # Test artifacts
 /jest*
 /specs/reports
 /specs/screenshots
+/specs/tmp-*/
 
 # Ignore Mac DS_Store files
 .DS_Store

CONTRIBUTING.md

@@ -17,16 +17,16 @@ If you have any questions or want to read more, check out the
 
 ## Where to contribute?
 
-During the development process the development fork of the project will be hosted at [truetandem/e-QIP-prototype](https://github.com/truetandem/e-QIP-prototype).
+During the development process the development fork of the project will be hosted at [18F/e-QIP-prototype](https://github.com/18F/e-QIP-prototype).
 This may cause some confusion so we have outlined some basic steps for contributing:
 
- 1. Clone the repository `git clone https://github.com/truetandem/e-QIP-prototype $GOPATH/src/18F/e-QIP-prototype`
+ 1. Clone the repository `git clone https://github.com/18F/e-QIP-prototype $GOPATH/src/18F/e-QIP-prototype`
  2. Change in to the new directory `cd $GOPATH/src/18F/e-QIP-prototype`
  3. Fork the code on Github
  4. Add a **git remote** with `git remote add fork <path/to/forked/repository>`
  5. Make changes and commit them locally
  6. Push to **fork** using `git push fork`
- 7. Create a **pull request** from the forked repository to the [truetandem/e-QIP-prototype](https://github.com/truetandem/e-QIP-prototype) repository
+ 7. Create a **pull request** from the forked repository to the [18F/e-QIP-prototype](https://github.com/18F/e-QIP-prototype) repository
 
 ## Public domain