fix anonymous and authenticated #18

src/util/anonymous.js

@@ -1,49 +1,26 @@
-import React from 'react';
 import debug from 'debug';
-import { listener } from 'web-framework';
+import { listener } from '../decorator/listener';
 
 const log = debug('util:@anonymous');
 
-export default function anonymous(homeState?: string) {
+export default function anonymous(Home = 'Home') {
+  return function (Component) {
 
-  const home = homeState || 'Home';
-
-  return function(Component) {
-
-    @listener
-    class AnonymousWrapper extends React.Component {
-
-      static willTransitionTo(transition) {
-        const app = transition.context;
-        if (app.isAuthenticated()) {
-          log(`user is authenticated, redirecting to ${home}...`);
-          transition.redirect(home);
-        }
-      };
-
-      checkAuthentication() {
-        if (this.props.app.isAuthenticated()) {
-          const { nextPath = home } = this.props.router.getCurrentQuery();
-          log('user is authenticated, redirecting to %s...', nextPath);
-          this.props.router.transitionTo(nextPath);
-        }
-      }
-
-      componentWillReceiveProps() {
-        this.checkAuthentication();
-      }
-
-      componentWillMount() {
-        this.checkAuthentication();
+    listener(function () {
+      if (this.props.app.isAuthenticated()) {
+        const { nextPath = Home } = this.props.router.getCurrentQuery();
+        log('listening... user is authenticated, redirecting to %s...', nextPath);
+        this.props.router.transitionTo(nextPath);
       }
+    })(Component);
 
-      render() {
-        return <Component {...this.props} />;
+    Component.willTransitionTo = function (transition) {
+      const app = transition.context;
+      if (app.isAuthenticated()) {
+        log('transition to `%s` aborted (user is authenticated), redirecting to %s...', transition.path, Home);
+        transition.redirect(Home);
       }
+    };
 
-    }
-
-    return AnonymousWrapper;
   };
-
 }

src/util/authenticated.js

@@ -1,51 +1,28 @@
-import React from 'react';
 import debug from 'debug';
-import { listener } from 'web-framework';
+import { listener } from '../decorator/listener';
 
 const log = debug('util:@authenticated');
 
-export default function authenticated(loginState?: string) {
+export default function authenticated(Login = 'Login') {
+  return function (Component) {
 
-  const login = loginState || 'Login';
-
-  return function(Component) {
-
-    @listener
-    class AuthenticatedWrapper extends React.Component {
-
-      static willTransitionTo(transition) {
-        const app = transition.context;
-        if (!app.isAuthenticated()) {
-          log(`transition to \`%s\` aborted (user is not authenticated), redirecting to ${login}...`, transition.path);
-          transition.redirect(login, {}, {
-            nextPath: transition.path
-          });
-        }
-      };
-
-      checkAuthentication() {
-        const app = this.props.app;
-        if (!app.isAuthenticated()) {
-          log(`user is not authenticated, redirecting to ${login}...`);
-          this.props.router.transitionTo(login);
-        }
+    listener(function () {
+      const app = this.props.app;
+      if (!app.isAuthenticated()) {
+        log('listening... user is not authenticated, redirecting to %s...', Login);
+        this.props.router.transitionTo(Login);
       }
-
-      componentWillReceiveProps() {
-        this.checkAuthentication();
+    })(Component);
+
+    Component.willTransitionTo = function (transition) {
+      const app = transition.context;
+      if (!app.isAuthenticated()) {
+        log('transition to `%s` aborted (user is not authenticated), redirecting to %s...', transition.path, Login);
+        transition.redirect(Login, {}, {
+          nextPath: transition.path
+        });
       }
+    };
 
-      componentWillMount() {
-        this.checkAuthentication();
-      }
-
-      render() {
-        return <Component {...this.props} />;
-      }
-
-    }
-
-    return AuthenticatedWrapper;
   };
-
 }