v2.2.2-beta.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-oidc",
-  "version": "2.2.1",
+  "version": "2.2.2-beta.1",
   "description": "A package for managing OpenID Connect authentication in redux apps",
   "main": "dist/redux-oidc.js",
   "scripts": {

src/OidcProvider.js

@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { userExpired, userFound, silentRenewError, sessionTerminated, userExpiring } from './actions';
+import { userExpired, userFound, silentRenewError, sessionTerminated, userExpiring, userSignedOut } from './actions';
 
 class OidcProvider extends React.Component {
   static propTypes = {
@@ -29,6 +29,7 @@ class OidcProvider extends React.Component {
     this.userManager.events.addAccessTokenExpired(this.onAccessTokenExpired);
     this.userManager.events.addAccessTokenExpiring(this.onAccessTokenExpiring);
     this.userManager.events.addUserUnloaded(this.onUserUnloaded);
+    this.userManager.events.addUserSignedOut(this.onUserSignedOut);
   }
 
   componentWillUnmount() {
@@ -38,6 +39,7 @@ class OidcProvider extends React.Component {
     this.userManager.events.removeAccessTokenExpired(this.onAccessTokenExpired);
     this.userManager.events.removeAccessTokenExpiring(this.onAccessTokenExpiring);
     this.userManager.events.removeUserUnloaded(this.onUserUnloaded);
+    this.userManager.events.removeUserSignedOut(this.onUserSignedOut);
   }
 
   // event callback when the user has been loaded (on silent renew or redirect)
@@ -65,6 +67,11 @@ class OidcProvider extends React.Component {
     this.props.store.dispatch(userExpiring());
   }
 
+  // event callback when the user is signed out
+  onUserSignedOut = () => {
+    this.props.store.dispatch(userSignedOut());
+  }
+
   render() {
     return React.Children.only(this.props.children);
   }

src/actions/index.js

@@ -5,7 +5,8 @@ import {
   SILENT_RENEW_ERROR,
   USER_EXPIRING,
   SESSION_TERMINATED,
-  LOADING_USER
+  LOADING_USER,
+  USER_SIGNED_OUT
 } from '../constants'
 
 // dispatched when the existing user expired
@@ -60,3 +61,9 @@ export function loadingUser() {
     type: LOADING_USER
   };
 }
+
+export function userSignedOut() {
+  return {
+    type: USER_SIGNED_OUT
+  };
+}

src/constants/index.js

@@ -7,3 +7,4 @@ export const SESSION_TERMINATED = 'redux-oidc/SESSION_TERMINATED';
 export const USER_EXPIRING = 'redux-oidc/USER_EXPIRING';
 export const USER_FOUND = 'redux-oidc/USER_FOUND';
 export const LOADING_USER = 'redux-oidc/LOADING_USER';
+export const USER_SIGNED_OUT = 'redux-oidc/USER_SIGNED_OUT';

src/index.js

@@ -17,6 +17,7 @@ export const SILENT_RENEW_ERROR = require('./constants').SILENT_RENEW_ERROR;
 export const SESSION_TERMINATED = require('./constants').SESSION_TERMINATED;
 export const USER_EXPIRING = require('./constants').USER_EXPIRING;
 export const LOADING_USER = require('./constants').LOADING_USER;
+export const USER_SIGNED_OUT = require('./constants').USER_SIGNED_OUT;
 
 // actions
 export const userExpired = require('./actions').userExpired;
@@ -26,5 +27,6 @@ export const silentRenewError = require('./actions').silentRenewError;
 export const sessionTerminated = require('./actions').sessionTerminated;
 export const userExpiring = require('./actions').userExpiring;
 export const loadingUser = require('./actions').loadingUser;
+export const userSignedOut = require('./actions').userSignedOut;
 
 export default createOidcMiddleware;

src/reducer/reducer-immutable.js

@@ -6,7 +6,8 @@ import {
   USER_NOT_FOUND,
   SILENT_RENEW_ERROR,
   SESSION_TERMINATED,
-  LOADING_USER
+  LOADING_USER,
+  USER_SIGNED_OUT
 } from '../constants';
 
 const initialState = fromJS({
@@ -21,6 +22,7 @@ export default function reducer(state = initialState, action) {
     case SILENT_RENEW_ERROR:
       return state.set('isLoadingUser', false);
     case SESSION_TERMINATED:
+    case USER_SIGNED_OUT:
       return fromJS({
         user: null,
         isLoadingUser: false

src/reducer/reducer.js

@@ -4,7 +4,8 @@ import {
   USER_FOUND, USER_NOT_FOUND,
   SILENT_RENEW_ERROR,
   SESSION_TERMINATED,
-  LOADING_USER
+  LOADING_USER,
+  USER_SIGNED_OUT
 } from '../constants';
 
 const initialState = {
@@ -19,6 +20,7 @@ export default function reducer(state = initialState, action) {
     case SILENT_RENEW_ERROR:
         return Object.assign({}, { ...state }, { isLoadingUser: false });
     case SESSION_TERMINATED:
+    case USER_SIGNED_OUT:
       return Object.assign({}, { ...state }, { user: null, isLoadingUser: false });
     case REDIRECT_SUCCESS:
     case USER_FOUND:

tests/OidcProvider.test.js

@@ -2,7 +2,7 @@ import './setup';
 import expect from 'expect';
 import sinon from 'sinon';
 import OidcProvider from '../src/OidcProvider';
-import { userExpired, userFound, silentRenewError, sessionTerminated, userExpiring, redirectSuccess } from '../src/actions';
+import { userExpired, userFound, silentRenewError, sessionTerminated, userExpiring, redirectSuccess, userSignedOut } from '../src/actions';
 
 describe('<OidcProvider />', () => {
   let userManagerMock;
@@ -13,11 +13,13 @@ describe('<OidcProvider />', () => {
   let addAccessTokenExpiredStub;
   let addUserUnloadedStub;
   let addAccessTokenExpiringStub;
+  let addUserSignedOutStub;
   let removeUserLoadedStub;
   let removeSilentRenewErrorStub;
   let removeAccessTokenExpiredStub;
   let removeUserUnloadedStub;
   let removeAccessTokenExpiringStub;
+  let removeUserSignedOutStub;
   let dispatchStub;
   let props;
   let provider;
@@ -28,11 +30,13 @@ describe('<OidcProvider />', () => {
     addAccessTokenExpiredStub = sinon.stub();
     addUserUnloadedStub = sinon.stub();
     addAccessTokenExpiringStub = sinon.stub();
+    addUserSignedOutStub = sinon.stub();
     removeUserLoadedStub = sinon.stub();
     removeSilentRenewErrorStub = sinon.stub();
     removeAccessTokenExpiredStub = sinon.stub();
     removeUserUnloadedStub = sinon.stub();
     removeAccessTokenExpiringStub = sinon.stub();
+    removeUserSignedOutStub = sinon.stub();
     dispatchStub = sinon.stub();
 
     eventsMock = {
@@ -41,11 +45,13 @@ describe('<OidcProvider />', () => {
       addAccessTokenExpired: addAccessTokenExpiredStub,
       addUserUnloaded: addUserUnloadedStub,
       addAccessTokenExpiring: addAccessTokenExpiringStub,
+      addUserSignedOut: addUserSignedOutStub,
       removeUserLoaded: removeUserLoadedStub,
       removeSilentRenewError: removeSilentRenewErrorStub,
       removeAccessTokenExpired: removeAccessTokenExpiredStub,
       removeUserUnloaded: removeUserUnloadedStub,
-      removeAccessTokenExpiring: removeAccessTokenExpiringStub
+      removeAccessTokenExpiring: removeAccessTokenExpiringStub,
+      removeUserSignedOut: removeUserSignedOutStub
     };
 
     userManagerMock = {
@@ -82,6 +88,7 @@ describe('<OidcProvider />', () => {
     expect(addAccessTokenExpiredStub.calledWith(provider.onAccessTokenExpired)).toEqual(true);
     expect(addUserUnloadedStub.calledWith(provider.onUserUnloaded)).toEqual(true);
     expect(addAccessTokenExpiringStub.calledWith(provider.onAccessTokenExpiring)).toEqual(true);
+    expect(addUserSignedOutStub.calledWith(provider.onUserSignedOut)).toEqual(true);
   });
 
   it('should remove event registrations on componentWillUnmount()', () => {
@@ -92,6 +99,7 @@ describe('<OidcProvider />', () => {
     expect(removeAccessTokenExpiredStub.calledWith(provider.onAccessTokenExpired)).toEqual(true);
     expect(removeUserUnloadedStub.calledWith(provider.onUserUnloaded)).toEqual(true);
     expect(removeAccessTokenExpiringStub.calledWith(provider.onAccessTokenExpiring)).toEqual(true);
+    expect(removeUserSignedOutStub.calledWith(provider.onUserSignedOut)).toEqual(true);
   });
 
   it('should handle the userLoaded event correctly', () => {
@@ -125,4 +133,10 @@ describe('<OidcProvider />', () => {
 
     expect(dispatchStub.calledWith(userExpiring())).toEqual(true);
   });
+
+  it('should handle the userSignedOut event correctly', () => {
+    provider.onUserSignedOut();
+
+    expect(dispatchStub.calledWith(userSignedOut())).toEqual(true);
+  });
 });

tests/actions/index.test.js

@@ -1,8 +1,8 @@
 import '../setup';
 import expect from 'expect';
 import sinon from 'sinon';
-import { USER_EXPIRED, REDIRECT_SUCCESS, USER_FOUND, SILENT_RENEW_ERROR, USER_EXPIRING, SESSION_TERMINATED, LOADING_USER } from '../../src/constants';
-import { userExpired, userFound, silentRenewError, sessionTerminated, userExpiring, redirectSuccess, loadingUser } from '../../src/actions';
+import { USER_EXPIRED, REDIRECT_SUCCESS, USER_FOUND, SILENT_RENEW_ERROR, USER_EXPIRING, SESSION_TERMINATED, LOADING_USER, USER_SIGNED_OUT } from '../../src/constants';
+import { userExpired, userFound, silentRenewError, sessionTerminated, userExpiring, redirectSuccess, loadingUser, userSignedOut } from '../../src/actions';
 
 describe('action - userExpired', () => {
   it('should return the correct action object', () => {
@@ -61,3 +61,10 @@ describe('action - loadingUser', () => {
     expect(action.type).toEqual(LOADING_USER);
   });
 });
+
+describe('action - userSignedOut', () => {
+  it('should return the correct action object', () => {
+    const action = userSignedOut();
+    expect(action.type).toEqual(USER_SIGNED_OUT);
+  });
+});

tests/reducer/reducer-immutable.test.js

@@ -2,7 +2,7 @@ import '../setup';
 import expect from 'expect';
 import sinon from 'sinon';
 import { fromJS } from 'immutable';
-import { userExpired, userFound, userNotFound, silentRenewError, sessionTerminated, userExpiring, redirectSuccess, loadingUser } from '../../src/actions';
+import { userExpired, userFound, userNotFound, silentRenewError, sessionTerminated, userExpiring, redirectSuccess, loadingUser, userSignedOut } from '../../src/actions';
 import reducer from '../../src/reducer/reducer-immutable';
 
 const initialState = fromJS({
@@ -72,6 +72,15 @@ describe('immutable reducer', () => {
     expect(reducer(initialState, loadingUser())).toEqual(expectedResult);
   });
 
+  it('should handle USER_SIGNED_OUT correctly', () => {
+    const expectedResult = fromJS({
+      user: null,
+      isLoadingUser: false
+    });
+
+    expect(reducer(initialState, userSignedOut())).toEqual(expectedResult);
+  });
+
   it('should handle the default correctly', () => {
     const expectedResult = fromJS({
       some: 'data'

tests/reducer/reducer.test.js

@@ -9,7 +9,8 @@ import {
   sessionTerminated,
   userExpiring,
   redirectSuccess,
-  loadingUser
+  loadingUser,
+  userSignedOut
 } from '../../src/actions';
 import reducer from '../../src/reducer/reducer';
 
@@ -79,6 +80,15 @@ describe('reducer', () => {
     expect(reducer(initialState, loadingUser())).toEqual(expectedResult);
   });
 
+  it('should handle USER_SIGNED_OUT correctly', () => {
+    const expectedResult = {
+      user: null,
+      isLoadingUser: false
+    };
+
+    expect(reducer(initialState, userSignedOut())).toEqual(expectedResult);
+  });
+
   it('should handle the default correctly', () => {
     const expectedResult = {
       some: 'data'