diff --git a/package.json b/package.json
index d1395ce80..d078820f9 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
},
"private": true,
"scripts": {
- "clean": "rm -f public/bundle-* && rm -f public/style-* && rm -f bin/server.js",
+ "clean": "rm -f public/bundle* && rm -f public/style* && rm -f bin/server.js",
"build:server": "webpack -p --config config/webpack.server.js",
"build:client": "webpack -p --config config/webpack.config.js",
"build:server:test": "webpack --config config/webpack.server.js",
@@ -22,7 +22,7 @@
"test:watch": "mocha --watch --reporter nyan",
"dev": "babel-node bin/dev.js",
"start": "node bin/server.js",
- "deploy": "mkdir -p ./prod && cp -rf ./views ./prod && cp -rf ./bin ./prod && cp -rf ./public ./prod",
+ "deploy": "mkdir -p ./prod && cp -rf ./views ./prod && cp -rf ./bin ./prod && rm -f ./prod/public/bundle* && rm -f ./prod/public/style* && cp -rf ./public ./prod",
"exportStrings": "babel-node bin/manageTranslations.js",
"format": "./node_modules/prettier/bin/prettier.js --single-quote --write 'src/**/*.js'"
},
diff --git a/src/components/forms/RegistrationCASOauth/RegistrationCASOauth.js b/src/components/forms/RegistrationCAS/RegistrationCAS.js
similarity index 94%
rename from src/components/forms/RegistrationCASOauth/RegistrationCASOauth.js
rename to src/components/forms/RegistrationCAS/RegistrationCAS.js
index 35a29715f..653cb5220 100644
--- a/src/components/forms/RegistrationCASOauth/RegistrationCASOauth.js
+++ b/src/components/forms/RegistrationCAS/RegistrationCAS.js
@@ -11,7 +11,7 @@ import FormBox from '../../widgets/FormBox';
import { CASAuthenticationButtonField, SelectField } from '../Fields';
import SubmitButton from '../SubmitButton';
-const RegistrationCASOauth = ({
+const RegistrationCAS = ({
submitting,
handleSubmit,
submitSucceeded,
@@ -19,7 +19,7 @@ const RegistrationCASOauth = ({
anyTouched,
instances = Map(),
invalid
-}) => (
+}) =>
- {(...instances) => (
+ {(...instances) =>
({ key, name }))
]}
- />
- )}
+ />}
-
-);
+ ;
-RegistrationCASOauth.propTypes = {
+RegistrationCAS.propTypes = {
instances: ImmutablePropTypes.map.isRequired,
handleSubmit: PropTypes.func.isRequired,
onSubmit: PropTypes.func.isRequired,
@@ -145,7 +143,7 @@ const initialValues = {
};
export default reduxForm({
- form: 'registration-cas-oauth',
+ form: 'registration-cas',
initialValues,
validate
-})(RegistrationCASOauth);
+})(RegistrationCAS);
diff --git a/src/components/forms/RegistrationCAS/index.js b/src/components/forms/RegistrationCAS/index.js
new file mode 100644
index 000000000..6ed5b4537
--- /dev/null
+++ b/src/components/forms/RegistrationCAS/index.js
@@ -0,0 +1 @@
+export default from './RegistrationCAS';
diff --git a/src/components/forms/RegistrationCASOauth/index.js b/src/components/forms/RegistrationCASOauth/index.js
deleted file mode 100644
index a0ea9dcde..000000000
--- a/src/components/forms/RegistrationCASOauth/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './RegistrationCASOauth';
diff --git a/src/pages/Registration/Registration.js b/src/pages/Registration/Registration.js
index 3323c969a..45a6b25e6 100644
--- a/src/pages/Registration/Registration.js
+++ b/src/pages/Registration/Registration.js
@@ -9,7 +9,7 @@ import { Row, Col } from 'react-bootstrap';
import PageContent from '../../components/layout/PageContent';
import RegistrationForm from '../../components/forms/RegistrationForm';
import ExternalRegistrationForm from '../../components/forms/ExternalRegistrationForm';
-import RegistrationCASOauth from '../../components/forms/RegistrationCASOauth';
+import RegistrationCAS from '../../components/forms/RegistrationCAS';
import {
createAccount,
@@ -89,9 +89,9 @@ class Register extends Component {
}
{process.env.ALLOW_CAS_REGISTRATION === 'true' &&
-
}
diff --git a/src/redux/modules/auth.js b/src/redux/modules/auth.js
index 0007379a3..1bba7395c 100644
--- a/src/redux/modules/auth.js
+++ b/src/redux/modules/auth.js
@@ -105,7 +105,7 @@ export const loginServices = {
local: LOCAL_LOGIN,
external: {
CAS_UK: 'cas-uk',
- CAS_UK_TICKET: 'cas-uk/oauth'
+ CAS_UK_TICKET: 'cas-uk/cas'
}
};