ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-29 00:58:03 +02:00
Code Issues Releases Wiki Activity

Rename RedirectProxyHandler to AuthProxyHandler

Browse Source
This commit is contained in:
vrde 2015-10-12 17:00:53 +02:00
parent 04abf31354
commit 12d3fb289e
4 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js → js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js
View File

@ -19,7 +19,7 @@ const { object } = React.PropTypes;
* @param {string} options.to Any type of route path that is defined in routes.js * @param {string} options.to Any type of route path that is defined in routes.js
* @param {enum/string} options.when ('loggedIn' || 'loggedOut') * @param {enum/string} options.when ('loggedIn' || 'loggedOut')
*/ */
export default function RedirectProxyHandler({to, when}) { export default function AuthProxyHandler({to, when}) {
return (Component) => { return (Component) => {
return React.createClass({ return React.createClass({
propTypes: { propTypes: {

16
js/components/whitelabel/prize/prize_routes.js
View File

@ -19,7 +19,7 @@ import ErrorNotFoundPage from '../../../components/error_not_found_page';
import App from './prize_app'; import App from './prize_app';
import AppConstants from '../../../constants/application_constants'; import AppConstants from '../../../constants/application_constants';
import RedirectProxyHandler from '../../../components/ascribe_routes/proxy_routes/redirect_proxy_handler'; import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
let baseUrl = AppConstants.baseUrl; let baseUrl = AppConstants.baseUrl;
@ -30,26 +30,26 @@ function getRoutes() {
<IndexRoute component={Landing} /> <IndexRoute component={Landing} />
<Route <Route
path='login' path='login'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
<Route <Route
path='logout' path='logout'
component={RedirectProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
<Route <Route
path='signup' path='signup'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
<Route <Route
path='password_reset' path='password_reset'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
<Route <Route
path='settings' path='settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
<Route <Route
path='register_piece' path='register_piece'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(PrizeRegisterPiece)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PrizeRegisterPiece)}
headerTitle='+ NEW WORK'/> headerTitle='+ NEW WORK'/>
<Route <Route
path='collection' path='collection'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(PrizePieceList)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PrizePieceList)}
headerTitle='COLLECTION'/> headerTitle='COLLECTION'/>
<Route path='pieces/:pieceId' component={PrizePieceContainer} /> <Route path='pieces/:pieceId' component={PrizePieceContainer} />

54
js/components/whitelabel/wallet/wallet_routes.js
View File

@ -30,7 +30,7 @@ import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_
import CCRegisterPiece from './components/cc/cc_register_piece'; import CCRegisterPiece from './components/cc/cc_register_piece';
import RedirectProxyHandler from '../../../components/ascribe_routes/proxy_routes/redirect_proxy_handler'; import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
import WalletApp from './wallet_app'; import WalletApp from './wallet_app';
import AppConstants from '../../../constants/application_constants'; import AppConstants from '../../../constants/application_constants';
@ -44,29 +44,29 @@ let ROUTES = {
<IndexRoute component={CylandLanding} /> <IndexRoute component={CylandLanding} />
<Route <Route
path='login' path='login'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
<Route <Route
path='logout' path='logout'
component={RedirectProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
<Route <Route
path='signup' path='signup'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
<Route <Route
path='password_reset' path='password_reset'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
<Route <Route
path='settings' path='settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
<Route <Route
path='contract_settings' path='contract_settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
<Route <Route
path='register_piece' path='register_piece'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(CylandRegisterPiece)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(CylandRegisterPiece)}
headerTitle='+ NEW WORK'/> headerTitle='+ NEW WORK'/>
<Route <Route
path='collection' path='collection'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(CylandPieceList)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(CylandPieceList)}
headerTitle='COLLECTION'/> headerTitle='COLLECTION'/>
<Route path='editions/:editionId' component={EditionContainer} /> <Route path='editions/:editionId' component={EditionContainer} />
<Route path='verify' component={CoaVerifyContainer} /> <Route path='verify' component={CoaVerifyContainer} />
@ -78,29 +78,29 @@ let ROUTES = {
<Route path={baseUrl} component={WalletApp}> <Route path={baseUrl} component={WalletApp}>
<Route <Route
path='login' path='login'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
<Route <Route
path='logout' path='logout'
component={RedirectProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
<Route <Route
path='signup' path='signup'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
<Route <Route
path='password_reset' path='password_reset'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
<Route <Route
path='settings' path='settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
<Route <Route
path='contract_settings' path='contract_settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
<Route <Route
path='register_piece' path='register_piece'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(CCRegisterPiece)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(CCRegisterPiece)}
headerTitle='+ NEW WORK'/> headerTitle='+ NEW WORK'/>
<Route <Route
path='collection' path='collection'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(PieceList)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PieceList)}
headerTitle='COLLECTION'/> headerTitle='COLLECTION'/>
<Route path='pieces/:pieceId' component={PieceContainer} /> <Route path='pieces/:pieceId' component={PieceContainer} />
<Route path='editions/:editionId' component={EditionContainer} /> <Route path='editions/:editionId' component={EditionContainer} />
@ -113,39 +113,39 @@ let ROUTES = {
<IndexRoute component={IkonotvLanding} /> <IndexRoute component={IkonotvLanding} />
<Route <Route
path='login' path='login'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
<Route <Route
path='logout' path='logout'
component={RedirectProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
<Route <Route
path='signup' path='signup'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
<Route <Route
path='password_reset' path='password_reset'
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
<Route <Route
path='settings' path='settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
<Route <Route
path='contract_settings' path='contract_settings'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
<Route <Route
path='request_loan' path='request_loan'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(ContractAgreementForm)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractAgreementForm)}
headerTitle='SEND NEW CONTRACT' headerTitle='SEND NEW CONTRACT'
aclName='acl_create_contractagreement'/> aclName='acl_create_contractagreement'/>
<Route <Route
path='register_piece' path='register_piece'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvRegisterPiece)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvRegisterPiece)}
headerTitle='+ NEW WORK' headerTitle='+ NEW WORK'
aclName='acl_create_piece'/> aclName='acl_create_piece'/>
<Route <Route
path='collection' path='collection'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvPieceList)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvPieceList)}
headerTitle='COLLECTION'/> headerTitle='COLLECTION'/>
<Route <Route
path='contract_notifications' path='contract_notifications'
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvContractNotifications)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(IkonotvContractNotifications)}/>
<Route path='pieces/:pieceId' component={IkonotvPieceContainer} /> <Route path='pieces/:pieceId' component={IkonotvPieceContainer} />
<Route path='editions/:editionId' component={EditionContainer} /> <Route path='editions/:editionId' component={EditionContainer} />
<Route path='verify' component={CoaVerifyContainer} /> <Route path='verify' component={CoaVerifyContainer} />

18
js/routes.js
View File

@ -25,7 +25,7 @@ import ErrorNotFoundPage from './components/error_not_found_page';
import RegisterPiece from './components/register_piece'; import RegisterPiece from './components/register_piece';
import RedirectProxyHandler from './components/ascribe_routes/proxy_routes/redirect_proxy_handler'; import AuthProxyHandler from './components/ascribe_routes/proxy_routes/auth_proxy_handler';
import AppConstants from './constants/application_constants'; import AppConstants from './constants/application_constants';
@ -36,32 +36,32 @@ let COMMON_ROUTES = (
<Route path={baseUrl} component={App}> <Route path={baseUrl} component={App}>
<Route <Route
path="login" path="login"
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
<Route <Route
path="register_piece" path="register_piece"
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(RegisterPiece)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(RegisterPiece)}
headerTitle="+ NEW WORK"/> headerTitle="+ NEW WORK"/>
<Route <Route
path="collection" path="collection"
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(PieceList)} component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(PieceList)}
headerTitle="COLLECTION"/> headerTitle="COLLECTION"/>
<Route <Route
path="signup" path="signup"
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(SignupContainer)} />
<Route <Route
path="logout" path="logout"
component={RedirectProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/> component={AuthProxyHandler({to: '/', when: 'loggedOut'})(LogoutContainer)}/>
<Route path="pieces/:pieceId" component={PieceContainer} /> <Route path="pieces/:pieceId" component={PieceContainer} />
<Route path="editions/:editionId" component={EditionContainer} /> <Route path="editions/:editionId" component={EditionContainer} />
<Route <Route
path="password_reset" path="password_reset"
component={RedirectProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} /> component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(PasswordResetContainer)} />
<Route <Route
path="settings" path="settings"
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(SettingsContainer)}/>
<Route <Route
path="contract_settings" path="contract_settings"
component={RedirectProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/> component={AuthProxyHandler({to: '/login', when: 'loggedOut'})(ContractSettings)}/>
<Route path="coa_verify" component={CoaVerifyContainer} /> <Route path="coa_verify" component={CoaVerifyContainer} />
<Route path="*" component={ErrorNotFoundPage} /> <Route path="*" component={ErrorNotFoundPage} />
</Route> </Route>