From a5ae8fe289224a8efdde887ecc60598b37b8caf1 Mon Sep 17 00:00:00 2001
From: quinlanj <quin@expo.io>
Date: Sun, 15 Apr 2018 08:44:03 +0000
Subject: [PATCH] Enable user sessions, delete auth0 tokens (#2343)

* [xdl] remove auth0 everywhere

* [xdl] enable sessions

* [www] remove xdl test helper on www

* [xdl] fixed tests

* [xdl/xde] pr feedback

fbshipit-source-id: 164bbcc
---
 src/state/reducers/auth.js | 20 +-------------------
 src/ui/MainScreen.js       |  3 ---
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/state/reducers/auth.js b/src/state/reducers/auth.js
index 59381402..83e77805 100644
--- a/src/state/reducers/auth.js
+++ b/src/state/reducers/auth.js
@@ -26,9 +26,6 @@ export const actions = {
     asyncAction(
       'CHECK_SESSION',
       async () => {
-        // migrate from auth0 to sessions, if available
-        await UserManager.migrateAuth0ToSessionAsync();
-
         const user = await UserManager.getCurrentUserAsync();
         if (!user) {
           throw new Error('');
@@ -45,9 +42,6 @@ export const actions = {
     asyncAction(
       'LOGIN',
       async () => {
-        // migrate from auth0 to sessions, if available
-        await UserManager.migrateAuth0ToSessionAsync();
-
         const currentWindow = remote.getCurrentWindow();
         try {
           const user = await UserManager.loginAsync(loginType, loginArgs);
@@ -70,9 +64,6 @@ export const actions = {
 
   forgotPassword: (usernameOrEmail: string) =>
     asyncAction('FORGOT_PASSWORD', async () => {
-      // migrate from auth0 to sessions, if available
-      await UserManager.migrateAuth0ToSessionAsync();
-
       let result = await UserManager.forgotPasswordAsync(usernameOrEmail);
 
       if (result) {
@@ -87,9 +78,6 @@ export const actions = {
     asyncAction(
       'REGISTER',
       async (dispatch: AppDispatch, getState: () => AppState) => {
-        // migrate from auth0 to sessions, if available
-        await UserManager.migrateAuth0ToSessionAsync();
-
         const state = getState();
         const user = await UserManager.registerAsync(userData, state.auth.user);
         return {
@@ -110,8 +98,6 @@ type State = {
   pendingAction: ?ActionTypes,
   error: ?string,
   authenticated: boolean,
-  accessToken: ?string,
-  idToken: ?string, // jwt
   user: ?UserOrLegacyUser,
 };
 
@@ -120,8 +106,6 @@ const initialState: State = {
   pendingAction: null,
   error: null,
   authenticated: false,
-  accessToken: null,
-  idToken: null,
   user: null,
 };
 
@@ -149,9 +133,7 @@ function authComplete(state: State, action: LoginAction): State {
     ...state,
     pendingAction: null,
     error: null,
-    authenticated: !!user.accessToken || !!user.sessionSecret,
-    accessToken: user.accessToken || null,
-    idToken: user.idToken || null,
+    authenticated: !!user.sessionSecret,
     user,
   };
 }
diff --git a/src/ui/MainScreen.js b/src/ui/MainScreen.js
index 78b55269..dfdf3967 100644
--- a/src/ui/MainScreen.js
+++ b/src/ui/MainScreen.js
@@ -663,9 +663,6 @@ class MainScreen extends React.Component {
 
     this._logInfo('Publishing...');
     try {
-      // migrate from auth0 to sessions, if available
-      await UserManager.migrateAuth0ToSessionAsync();
-
       let result = await Project.publishAsync(this.state.projectRoot);
       await new Promise(resolve => {
         requestAnimationFrame(resolve);