FIX: Authが正しく行えない問題

Author: NEKOYASAN

firebase.json

@@ -1,8 +1,4 @@
 {
-  "firestore": {
-    "rules": "firestore.rules",
-    "indexes": "firestore.indexes.json"
-  },
   "functions": {
     "source": "dist/server",
     "predeploy": [
@@ -23,9 +19,6 @@
       }
     ]
   },
-  "storage": {
-    "rules": "storage.rules"
-  },
   "emulators": {
     "functions": {
       "port": 5001

firestore.indexes.json

@@ -58,20 +58,22 @@ export default {
   },
   methods: {
     ...mapActions('modules/user', ['login']),
-    async doLogin() {
-      await firebase
+    doLogin() {
+      firebase
         .auth()
         .signInWithEmailAndPassword(this.email, this.password)
-        .then((user) => {
-          this.login(user)
+        .then((userInfo) => {
+          this.login(userInfo)
+        })
+        .then(() => {
           this.$router.push('/edit')
         })
         .catch((error) => {
           alert(error)
         })
     },
     gotoSignup() {
-      this.$router.push('/signup')
+      this.$router.push('/account/signup')
     },
     gotoResetPassword() {
       this.$router.push('/reset-password')

firestore.rules

@@ -31,7 +31,7 @@
             <v-card-actions>
               <v-btn @click="gotoSignin">Login</v-btn>
               <v-spacer />
-              <v-btn @click="doSignin">Signin</v-btn>
+              <v-btn @click="doSignup">Signup</v-btn>
             </v-card-actions>
             <hr />
             <v-spacer />
@@ -58,32 +58,34 @@ export default {
   },
   methods: {
     ...mapActions('modules/user', ['login']),
-    async doLogin() {
-      await firebase
+    doSignup() {
+      firebase
         .auth()
         .createUserWithEmailAndPassword(this.email, this.password)
-        .then((user) => {
+        .then((userInfo) => {
           this.login({
-            uid: user.uid,
-            email: user.email,
-            username: user.displayName,
-            userImage: user.photoURL,
+            uid: userInfo.user.uid,
+            email: userInfo.user.email,
+            username: userInfo.user.displayName,
+            userImage: userInfo.user.photoURL,
           })
-          this.writeUserData(user.uid, user.email)
+          this.writeUserData(userInfo.user.uid, userInfo.user.email)
+        })
+        .then(() => {
           this.$router.push('/edit')
         })
         .catch((error) => {
           alert(error)
         })
     },
     gotoSignin() {
-      this.$router.push('/signin')
+      this.$router.push('/account/signin')
     },
     gotoResetPassword() {
       this.$router.push('/reset-password')
     },
     writeUserData(userId, email) {
-      return firebase.firestore().collection('classData').doc(userId).set({
+      return firebase.firestore().collection('users').doc(userId).set({
         email,
       })
     },

src/pages/account/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <h1>{{ uid }}</h1>
+  <h1>{{ userData }}</h1>
 </template>
 
 <script>
@@ -9,7 +9,7 @@ export default {
   layout: 'protected',
   name: 'IndexVue',
   computed: {
-    ...mapGetters('modules/user', ['uid']),
+    ...mapGetters('modules/user', ['userData']),
   },
 }
 </script>

src/pages/account/signup.vue

@@ -11,7 +11,7 @@ export const actions = {
     const classData = classDataSnapshot.data()
     await dispatch('modules/class/setClassData', { classData })
     if (user) {
-      await dispatch('modules/user/setUser', {
+      await dispatch('modules/user/setUserData', {
         name: user.name,
         email: user.email,
         avatar: user.picture,

src/pages/edit/index.vue

@@ -2,80 +2,48 @@ import Cookies from 'js-cookie'
 import firebase from '@/plugins/firebase.js'
 
 export const state = () => ({
-  user: null,
-  info: null,
-  uid: null,
+  userData: null,
 })
 
 export const mutations = {
-  setUser(state, payload) {
+  setUserData(state, payload) {
     if (payload) {
-      state.user = payload
+      state.userData = payload
     } else {
-      state.user = null
-    }
-  },
-  saveUid(state, payload) {
-    if (payload) {
-      state.uid = payload
-    } else {
-      state.uid = null
-    }
-  },
-  setInfo(state, payload) {
-    if (payload) {
-      state.info = payload
-    } else {
-      state.info = null
+      state.userData = null
     }
   },
 }
 
 export const actions = {
   async login({ dispatch, state }, user) {
-    console.log('userlogin')
     const token = await firebase.auth().currentUser.getIdToken(true)
     const userInfo = {
       name: user.displayName,
       email: user.email,
       avatar: user.photoURL,
       uid: user.uid,
     }
-
     Cookies.set('access_token', token) // saving token in cookie for server rendering
-    await dispatch('setUser', userInfo)
-    await dispatch('saveUid', userInfo.uid)
+    await dispatch('setUserData', userInfo)
   },
 
   async logout({ commit }) {
     await firebase.auth().signOut()
 
     Cookies.remove('access_token')
-    commit('setUser', null)
-    commit('saveUid', null)
-  },
-  setUser({ commit }, payload) {
-    commit('setUser', payload)
+    commit('setUserData', null)
   },
-  saveUid({ commit }, payload) {
-    commit('saveUid', payload)
-  },
-  setInfo({ commit }, payload) {
-    commit('setInfo', payload)
+  setUserData({ commit }, payload) {
+    commit('setUserData', payload)
   },
 }
 
 export const getters = {
-  user: (state) => {
-    return state.user
-  },
-  info: (state) => {
-    return state.info
-  },
-  uid: (state) => {
-    return state.uid
+  userData: (state) => {
+    return state.userData
   },
   isAuthenticated: (state) => {
-    return !!state.user && !!state.user.uid
+    return !!state.userData && !!state.userData.uid
   },
 }