Merge pull request #1108 from Automattic/update/move-accept-invite-to…

…-invites

Invites: move /accept-invite to /my-sites/invites

assets/stylesheets/_components.scss

@@ -6,12 +6,7 @@
 // stylesheet order does not matter.
 // ==========================================================================
 
-@import 'accept-invite/invite-form-header/style';
-@import 'accept-invite/invite-header/style';
-@import 'accept-invite/logged-in-accept/style';
-@import 'accept-invite/style';
 @import 'auth/style';
-@import 'accept-invite/logged-out-invite/style';
 @import 'components/accordion/style';
 @import 'components/add-new-button/style';
 @import 'components/author-selector/style';
@@ -177,6 +172,11 @@
 @import 'my-sites/draft/style';
 @import 'my-sites/drafts/style';
 @import 'my-sites/exporter/style';
+@import 'my-sites/invites/invite-form-header/style';
+@import 'my-sites/invites/invite-header/style';
+@import 'my-sites/invites/invite-accept/logged-in/style';
+@import 'my-sites/invites/invite-accept/logged-out/style';
+@import 'my-sites/invites/invite-accept/style';
 @import 'my-sites/media-library/style';
 @import 'my-sites/no-results/style';
 @import 'my-sites/pages/style';

client/boot/index.js

@@ -30,7 +30,6 @@ var config = require( 'config' ),
 	translatorInvitation = require( 'layout/community-translator/invitation-utils' ),
 	layoutFocus = require( 'lib/layout-focus' ),
 	nuxWelcome = require( 'nux-welcome' ),
-	inviteActions = require( 'accept-invite/actions' ),
 	emailVerification = require( 'components/email-verification' ),
 	viewport = require( 'lib/viewport' ),
 	detectHistoryNavigation = require( 'lib/detect-history-navigation' ),
@@ -43,6 +42,8 @@ var config = require( 'config' ),
 	Layout,
 	LoggedOutLayout;
 
+import { displayInviteAccepted } from 'lib/invites/actions';
+
 function init() {
 	var i18nLocaleStringsObject = null;
 
@@ -233,7 +234,7 @@ function boot() {
 		}
 
 		if ( context.query.invite_accepted ) {
-			inviteActions.displayInviteAccepted( parseInt( context.query.invite_accepted ) );
+			displayInviteAccepted( parseInt( context.query.invite_accepted ) );
 			page( context.pathname );
 		}
 

client/layout/index.jsx

@@ -19,7 +19,7 @@ var Masterbar = require( './masterbar' ),
 	EmailVerificationNotice = require( 'components/email-verification/email-verification-notice' ),
 	Welcome = require( 'my-sites/welcome/welcome' ),
 	WelcomeMessage = require( 'nux-welcome/welcome-message' ),
-	InviteMessage = require( 'accept-invite/invite-message' ),
+	InviteMessage = require( 'my-sites/invites/invite-message' ),
 	analytics = require( 'analytics' ),
 	config = require( 'config' ),
 	PulsingDot = require( 'components/pulsing-dot' ),

client/lib/invites/actions.js

@@ -14,39 +14,82 @@ import { action as ActionTypes } from 'lib/invites/constants';
  */
 const debug = new Debug( 'calypso:invites-actions' );
 
-const InvitesActions = {
-	fetchInvites( siteId, number = 100, offset = 0 ) {
-		debug( 'fetchInvites', siteId );
-
-		Dispatcher.handleViewAction( {
-			type: ActionTypes.FETCH_INVITES,
-			siteId,
-			offset
-		} );
+export function fetchInvites( siteId, number = 100, offset = 0 ) {
+	debug( 'fetchInvites', siteId );
 
-		wpcom.undocumented().invitesList( siteId, number, offset, function( error, data ) {
-			Dispatcher.handleServerAction( {
-				type: error ? ActionTypes.RECEIVE_INVITES_ERROR : ActionTypes.RECEIVE_INVITES,
-				siteId, offset, data, error
-			} );
-		} );
-	},
-	fetchInvite( siteId, inviteKey ) {
-		debug( 'fetchInvite', siteId, inviteKey );
-
-		Dispatcher.handleViewAction( {
-			type: ActionTypes.FETCH_INVITE,
-			siteId,
-			inviteKey
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.FETCH_INVITES,
+		siteId,
+		offset
+	} );
+
+	wpcom.undocumented().invitesList( siteId, number, offset, function( error, data ) {
+		Dispatcher.handleServerAction( {
+			type: error ? ActionTypes.RECEIVE_INVITES_ERROR : ActionTypes.RECEIVE_INVITES,
+			siteId, offset, data, error
 		} );
+	} );
+}
+
+export function fetchInvite( siteId, inviteKey ) {
+	debug( 'fetchInvite', siteId, inviteKey );
+
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.FETCH_INVITE,
+		siteId,
+		inviteKey
+	} );
 
-		wpcom.undocumented().getInvite( siteId, inviteKey, ( error, data ) => {
-			Dispatcher.handleServerAction( {
-				type: error ? ActionTypes.RECEIVE_INVITE_ERROR : ActionTypes.RECEIVE_INVITE,
-				siteId, inviteKey, data, error
-			} );
+	wpcom.undocumented().getInvite( siteId, inviteKey, ( error, data ) => {
+		Dispatcher.handleServerAction( {
+			type: error ? ActionTypes.RECEIVE_INVITE_ERROR : ActionTypes.RECEIVE_INVITE,
+			siteId, inviteKey, data, error
 		} );
+	} );
+}
+
+export function createAccount( userData, callback ) {
+	return wpcom.undocumented().usersNew(
+		Object.assign( {}, userData, { validate: false } ),
+		( error, response ) => {
+			const bearerToken = response && response.bearer_token;
+			callback( error, bearerToken );
+		}
+	);
+}
+
+export function acceptInvite( invite, callback, bearerToken ) {
+	if ( bearerToken ) {
+		wpcom.loadToken( bearerToken );
 	}
-};
+	return wpcom.undocumented().acceptInvite(
+		invite.blog_id,
+		invite.invite_slug,
+		callback
+	);
+}
+
+export function displayInviteAccepted( siteId ) {
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.DISPLAY_INVITE_ACCEPTED_NOTICE,
+		siteId
+	} );
+}
+
+export function dismissInviteAccepted() {
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.DISMISS_INVITE_ACCEPTED_NOTICE
+	} );
+}
+
+export function displayInviteDeclined() {
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.DISPLAY_INVITE_DECLINED_NOTICE
+	} );
+}
 
-export default InvitesActions;
+export function dismissInviteDeclined() {
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.DISMISS_INVITE_DECLINED_NOTICE
+	} );
+}

client/lib/invites/constants.js

@@ -12,5 +12,9 @@ export const action = keyMirror( {
 	RECEIVE_INVITES: null,
 	RECEIVE_INVITE: null,
 	RECEIVE_INVITES_ERROR: null,
-	RECEIVE_INVITE_ERROR: null
+	RECEIVE_INVITE_ERROR: null,
+	DISPLAY_INVITE_ACCEPTED_NOTICE: null,
+	DISMISS_INVITE_ACCEPTED_NOTICE: null,
+	DISPLAY_INVITE_DECLINED_NOTICE: null,
+	DISMISS_INVITE_DECLINED_NOTICE: null
 } );

client/accept-invite/invite-message/store.js → client/lib/invites/stores/invite-accepted.js

@@ -2,22 +2,22 @@
  * Internal dependencies
  */
 import { createReducerStore } from 'lib/store'
-import { DISPLAY_INVITE_ACCEPTED_NOTICE, DISMISS_INVITE_ACCEPTED_NOTICE, DISPLAY_INVITE_DECLINED_NOTICE, DISMISS_INVITE_DECLINED_NOTICE } from './constants'
+import { action as ActionTypes } from 'lib/invites/constants';
 
 const InviteMessageStore = createReducerStore( ( state, payload ) => {
 	const { action } = payload;
 	let newState = Object.assign( {}, state );
 	switch ( action.type ) {
-		case DISPLAY_INVITE_ACCEPTED_NOTICE:
+		case ActionTypes.DISPLAY_INVITE_ACCEPTED_NOTICE:
 			newState.accepted = true;
 			newState.siteId = action.siteId;
 			return newState;
-		case DISPLAY_INVITE_DECLINED_NOTICE:
+		case ActionTypes.DISPLAY_INVITE_DECLINED_NOTICE:
 			newState.declined = true;
 			newState.siteId = action.siteId;
 			return newState;
-		case DISMISS_INVITE_ACCEPTED_NOTICE:
-		case DISMISS_INVITE_DECLINED_NOTICE:
+		case ActionTypes.DISMISS_INVITE_ACCEPTED_NOTICE:
+		case ActionTypes.DISMISS_INVITE_DECLINED_NOTICE:
 			newState.accepted = false;
 			newState.declined = false;
 			newState.siteId = false;

client/lib/invites/stores/list-invites.js → client/lib/invites/stores/invites-list.js

@@ -2,7 +2,7 @@
  * Internal dependencies
  */
 import { createReducerStore } from 'lib/store';
-import { reducer, initialState } from 'lib/invites/reducers/list-invites';
+import { reducer, initialState } from 'lib/invites/reducers/invites-list';
 
 const InvitesStore = createReducerStore( reducer, initialState );
 

client/lib/invites/test/list-invites-store.js

@@ -51,7 +51,7 @@ describe( 'List Invites Store', function() {
 	};
 
 	beforeEach( function() {
-		ListInvitesStore = require( 'lib/invites/stores/list-invites' );
+		ListInvitesStore = require( 'lib/invites/stores/invites-list' );
 	} );
 
 	describe( 'Listing invites', function() {

client/my-sites/invites/controller.js

@@ -0,0 +1,23 @@
+/**
+ * External Dependencies
+ */
+import React from 'react';
+
+/**
+ * Internal Dependencies
+ */
+import i18n from 'lib/mixins/i18n';
+import titleActions from 'lib/screen-title/actions';
+import InviteAccept from 'my-sites/invites/invite-accept';
+
+export function acceptInvite( context ) {
+	titleActions.setTitle( i18n.translate( 'Accept Invite', { textOnly: true } ) );
+
+	React.unmountComponentAtNode( document.getElementById( 'secondary' ) );
+	context.layout.setState( { noSidebar: true } );
+
+	React.render(
+		React.createElement( InviteAccept, context.params ),
+		document.getElementById( 'primary' )
+	);
+}