diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a0750b5c..7497a9cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.2.7](https://github.com/dhis2/app-platform/compare/v3.2.6...v3.2.7) (2020-03-21) + + +### Bug Fixes + +* allow usernames login username or password to be shorter than 4 characters ([#325](https://github.com/dhis2/app-platform/issues/325)) ([625dbfa](https://github.com/dhis2/app-platform/commit/625dbfa470696a7215eba52713be6e2a7f2e9302)) + ## [3.2.6](https://github.com/dhis2/app-platform/compare/v3.2.5...v3.2.6) (2020-03-20) diff --git a/adapter/package.json b/adapter/package.json index 9aff2acf5..10fa58d82 100644 --- a/adapter/package.json +++ b/adapter/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-adapter", - "version": "3.2.6", + "version": "3.2.7", "repository": { "type": "git", "url": "https://github.com/amcgee/dhis2-app-platform", @@ -21,7 +21,7 @@ "moment": "^2.24.0" }, "devDependencies": { - "@dhis2/cli-app-scripts": "3.2.6" + "@dhis2/cli-app-scripts": "3.2.7" }, "scripts": { "build": "d2-app-scripts build" diff --git a/adapter/src/AuthBoundary/LoginModal.js b/adapter/src/AuthBoundary/LoginModal.js index 1af27dba7..96a9f13d0 100644 --- a/adapter/src/AuthBoundary/LoginModal.js +++ b/adapter/src/AuthBoundary/LoginModal.js @@ -19,7 +19,7 @@ export const LoginModal = () => { const [password, setPassword] = useState('') const [isDirty, setIsDirty] = useState(false) - const isValid = val => val && val.length > 3 + const isValid = val => val && val.length >= 2 const onSubmit = async e => { e.preventDefault() diff --git a/cli/package.json b/cli/package.json index 0bbeaeb02..718528447 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/cli-app-scripts", - "version": "3.2.6", + "version": "3.2.7", "repository": { "type": "git", "url": "https://github.com/amcgee/dhis2-app-platform", @@ -29,7 +29,7 @@ "@babel/preset-env": "^7.6.2", "@babel/preset-react": "^7.0.0", "@babel/preset-typescript": "^7.6.0", - "@dhis2/app-shell": "3.2.6", + "@dhis2/app-shell": "3.2.7", "@dhis2/cli-helpers-engine": "^1.5.0", "archiver": "^3.1.1", "babel-jest": "^24.9.0", diff --git a/examples/simple-app/yarn.lock b/examples/simple-app/yarn.lock index 6ac659a35..8f8929991 100644 --- a/examples/simple-app/yarn.lock +++ b/examples/simple-app/yarn.lock @@ -1107,19 +1107,19 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193" - integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA== +"@babel/types@7.8.3", "@babel/types@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" + integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== dependencies: esutils "^2.0.2" lodash "^4.17.13" to-fast-properties "^2.0.0" -"@babel/types@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" - integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.4": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193" + integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -1143,8 +1143,8 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== -"@dhis2/app-adapter@3.2.0", "@dhis2/app-adapter@file:../../adapter": - version "3.2.0" +"@dhis2/app-adapter@3.2.6", "@dhis2/app-adapter@file:../../adapter": + version "3.2.6" dependencies: "@dhis2/ui-widgets" "^2.0.4" moment "^2.24.0" @@ -1154,10 +1154,10 @@ resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-2.0.4.tgz#9ae202fef3313094aef33a3e38d2c6c5d799c808" integrity sha512-w5+C/fHSsuF0am5Tpvz53+tigEZzfz9ahkjXH3BiWxGVxwZGtdHjWfso1T5bJRiKhDTgf76TxIsQiC11W20WyA== -"@dhis2/app-shell@3.2.0", "@dhis2/app-shell@file:../../shell": - version "3.2.0" +"@dhis2/app-shell@3.2.6", "@dhis2/app-shell@file:../../shell": + version "3.2.6" dependencies: - "@dhis2/app-adapter" "3.2.0" + "@dhis2/app-adapter" "3.2.6" "@dhis2/app-runtime" "^2.0.4" "@dhis2/d2-i18n" "^1.0.5" "@dhis2/ui-core" "^4.6.1" @@ -1173,7 +1173,7 @@ typescript "^3.6.3" "@dhis2/cli-app-scripts@file:../../cli": - version "3.2.0" + version "3.2.6" dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -1186,7 +1186,7 @@ "@babel/preset-env" "^7.6.2" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "3.2.0" + "@dhis2/app-shell" "3.2.6" "@dhis2/cli-helpers-engine" "^1.5.0" archiver "^3.1.1" babel-jest "^24.9.0" @@ -1212,6 +1212,7 @@ rollup-plugin-postcss "^2.0.3" rollup-plugin-replace "^2.2.0" rollup-plugin-visualizer "^3.2.2" + styled-jsx "^3.2.5" "@dhis2/cli-helpers-engine@^1.5.0": version "1.5.0" @@ -1992,9 +1993,9 @@ acorn-walk@^6.0.0, acorn-walk@^6.0.1: integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.0, acorn@^6.0.1, acorn@^6.0.4, acorn@^6.2.1: version "6.4.0" @@ -11072,6 +11073,20 @@ styled-jsx@^3.2.2: stylis "3.5.4" stylis-rule-sheet "0.0.10" +styled-jsx@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-3.2.5.tgz#0172a3e13a0d6d8bf09167dcaf32cf7102d932ca" + integrity sha512-prEahkYwQHomUljJzXzrFnBmQrSMtWOBbXn8QeEkpfFkqMZQGshxzzp4H8ebBIsbVlHF/3+GSXMnmK/fp7qVYQ== + dependencies: + "@babel/types" "7.8.3" + babel-plugin-syntax-jsx "6.18.0" + convert-source-map "1.7.0" + loader-utils "1.2.3" + source-map "0.7.3" + string-hash "1.1.3" + stylis "3.5.4" + stylis-rule-sheet "0.0.10" + stylehacks@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" diff --git a/package.json b/package.json index df40a7673..d531270ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "3.2.6", + "version": "3.2.7", "private": true, "repository": { "type": "git", diff --git a/shell/package.json b/shell/package.json index 154fd478f..3cf9eeb6c 100644 --- a/shell/package.json +++ b/shell/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-shell", - "version": "3.2.6", + "version": "3.2.7", "repository": { "type": "git", "url": "https://github.com/amcgee/dhis2-app-platform", @@ -12,7 +12,7 @@ "access": "public" }, "dependencies": { - "@dhis2/app-adapter": "3.2.6", + "@dhis2/app-adapter": "3.2.7", "@dhis2/app-runtime": "^2.0.4", "@dhis2/d2-i18n": "^1.0.5", "@dhis2/ui-core": "^4.6.1", diff --git a/yarn.lock b/yarn.lock index efaeb7c07..ecaa98355 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2111,9 +2111,9 @@ acorn-walk@^6.0.0, acorn-walk@^6.0.1: integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== acorn@^6.0.0, acorn@^6.0.1, acorn@^6.0.4, acorn@^6.2.1: version "6.4.0" @@ -6336,7 +6336,7 @@ gulp-sort@^2.0.0: dependencies: through2 "^2.0.1" -gzip-size@5.1.1: +gzip-size@5.1.1, gzip-size@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== @@ -7121,6 +7121,11 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= +is-docker@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b" + integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -7366,7 +7371,7 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -is-wsl@^2.1.0: +is-wsl@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== @@ -9453,12 +9458,13 @@ open@^6.0.0: dependencies: is-wsl "^1.1.0" -open@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.0.0.tgz#7e52999b14eb73f90f0f0807fe93897c4ae73ec9" - integrity sha512-K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ== +open@^7.0.0, open@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz#db551a1af9c7ab4c7af664139930826138531c48" + integrity sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA== dependencies: - is-wsl "^2.1.0" + is-docker "^2.0.0" + is-wsl "^2.1.1" opencollective-postinstall@^2.0.2: version "2.0.2" @@ -12271,9 +12277,9 @@ source-list-map@^2.0.0: integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== source-map-explorer@^2.1.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.2.2.tgz#8c5f6e7518354337ad6fd4c4f69613c101f9d3a9" - integrity sha512-VDTLv5VHVMnHilf0NJv3NK6XPjRjBrhDTgdtdFywjcMxrC6DVhxEFSv1INWSK82+nW5FqL2yj37B0+LLD5wnEQ== + version "2.4.0" + resolved "https://registry.yarnpkg.com/source-map-explorer/-/source-map-explorer-2.4.0.tgz#92534a4c016aaa051cc887dca18d7bc568162be1" + integrity sha512-gXTmqqMlX1yF9uVZB2p9AvIhgArWvy7V+3NQ2lVgQvyux1eMAgnm3mC+k5mqV+2q7B/uWaFY+RG+fm+1opVkjA== dependencies: btoa "^1.2.1" chalk "^3.0.0" @@ -12281,11 +12287,12 @@ source-map-explorer@^2.1.0: ejs "^3.0.1" escape-html "^1.0.3" glob "^7.1.6" + gzip-size "^5.1.1" lodash "^4.17.15" - open "^7.0.0" + open "^7.0.3" source-map "^0.7.3" temp "^0.9.1" - yargs "^15.1.0" + yargs "^15.3.0" source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.2" @@ -14218,10 +14225,10 @@ yargs-parser@^13.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^16.1.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" - integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== +yargs-parser@^18.1.1: + version "18.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.1.tgz#bf7407b915427fc760fcbbccc6c82b4f0ffcbd37" + integrity sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -14260,10 +14267,10 @@ yargs@^13.1.0, yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.1" -yargs@^15.0.0, yargs@^15.1.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" - integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg== +yargs@^15.0.0, yargs@^15.1.0, yargs@^15.3.0: + version "15.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" + integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -14275,7 +14282,7 @@ yargs@^15.0.0, yargs@^15.1.0: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^16.1.0" + yargs-parser "^18.1.1" zip-stream@^2.1.2: version "2.1.2"