null許容の削除、一部の型の修正・削除、エラーの返し方の変更

Author: NEKOYASAN

src/pages/user/registered.vue

@@ -30,7 +30,7 @@ import { vxm } from '@/store'
 export default Vue.extend({
   components: { BottomSheetLayer, ActionButton },
   layout: 'background',
-  middleware: ['authenticated', 'checkClassData'],
+  middleware: 'authenticated',
   data() {
     return {
       classId: vxm.classData.classId

src/store/modules/classData.ts

@@ -15,6 +15,20 @@ const VuexModule = createModule({
   target: 'nuxt'
 })
 
+const generateUniqueId = (): string => {
+  const c =
+    'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをん'
+  const cl = c.length
+  const result =
+    c[Math.floor(Math.random() * cl)] +
+    c[Math.floor(Math.random() * cl)] +
+    c[Math.floor(Math.random() * cl)] +
+    c[Math.floor(Math.random() * cl)] +
+    c[Math.floor(Math.random() * cl)] +
+    c[Math.floor(Math.random() * cl)]
+  return result + ''
+}
+
 export class ClassDataStore extends VuexModule implements classData.ClassData {
   classId: classData.ClassId = ''
   className: string = ''
@@ -101,9 +115,9 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
     className: string
     schoolName: string
   }) {
-    let classId = this.generateUniqueId()
-    if (!vxm.user.uid) {
-      return Promise.reject(new Error('ユーザーが正しくログインされていません'))
+    let classId = generateUniqueId()
+    if (!vxm.user.isAuthenticated) {
+      throw new Error('ユーザーが正しくログインされていません')
     }
     try {
       const doc = await firebase
@@ -112,10 +126,10 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
         .doc(classId)
         .get()
       if (doc.exists) {
-        classId = this.generateUniqueId()
+        classId = generateUniqueId()
       }
     } catch {
-      return Promise.reject(new Error('エラーによって処理に失敗しました'))
+      throw new Error('エラーによって処理に失敗しました')
     }
     try {
       await firebase
@@ -143,6 +157,11 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
     } catch {
       return Promise.reject(new Error('エラーによって処理に失敗しました'))
     }
+    this.setClassData({
+      classId,
+      className,
+      lessons: []
+    })
   }
 
   @action
@@ -180,20 +199,6 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
     this.loadClassData(this.classId)
   }
 
-  private generateUniqueId(): string {
-    const c =
-      'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをん'
-    const cl = c.length
-    const result =
-      c[Math.floor(Math.random() * cl)] +
-      c[Math.floor(Math.random() * cl)] +
-      c[Math.floor(Math.random() * cl)] +
-      c[Math.floor(Math.random() * cl)] +
-      c[Math.floor(Math.random() * cl)] +
-      c[Math.floor(Math.random() * cl)]
-    return result + ''
-  }
-
   @mutation
   private setClassData({ classId, className, lessons }: classData.ClassData) {
     this.classId = classId

src/store/modules/user.ts

@@ -6,20 +6,17 @@ const VuexModule = createModule({
   strict: false,
   target: 'nuxt'
 })
-type Email = string | null
+type Email = string
 type EmailVerified = boolean
-type DisplayName = string | null
+type DisplayName = string
 type AllowAccess = AllowAccessData[]
 type AllowAccessData = {
   classId: string
   schoolName: string
   className: string
 }
-type AllowAccessFromUsers = {
-  classId: string
-  schoolName: string
-}
-type Uid = string | null
+
+type Uid = string
 
 interface User {
   email: Email
@@ -35,11 +32,11 @@ interface userData {
 }
 
 export class UserStore extends VuexModule implements User {
-  email: Email = null
+  email: Email = ''
   emailVerified: EmailVerified = false
-  displayName: DisplayName = null
+  displayName: DisplayName = ''
   allowAccess: AllowAccess = []
-  uid: Uid = null
+  uid: Uid = ''
 
   public get isAuthenticated(): boolean {
     return !!this.email && !!this.uid
@@ -71,28 +68,28 @@ export class UserStore extends VuexModule implements User {
       .doc(user.uid)
       .get()
 
-    const allowAccessData: AllowAccessFromUsers[] = data.get('allow_access')
+    const allowAccessData: string[] = data.get('allow_access')
     const allowAccess = []
     for (const value of allowAccessData) {
       const classData = await firebase
         .firestore()
         .collection('classData')
-        .doc(value.classId)
+        .doc(value)
         .get()
       const editorClassData = await firebase
         .firestore()
         .collection('editorClassData')
-        .doc(value.classId)
+        .doc(value)
         .get()
       allowAccess.push({
-        classId: value.classId,
+        classId: value,
         schoolName: editorClassData.get('schoolName'),
         className: classData.get('className')
       })
     }
 
     this.setUser({
-      email: user.email,
+      email: user.email ? user.email : '',
       emailVerified: user.emailVerified,
       displayName: data.get('username'),
       allowAccess,
@@ -108,21 +105,21 @@ export class UserStore extends VuexModule implements User {
       .doc(user.user_id)
       .get()
 
-    const allowAccessData: AllowAccessFromUsers[] = data.get('allow_access')
+    const allowAccessData: string[] = data.get('allow_access')
     const allowAccess = []
     for (const value of allowAccessData) {
       const classData = await firebase
         .firestore()
         .collection('classData')
-        .doc(value.classId)
+        .doc(value)
         .get()
       const editorClassData = await firebase
         .firestore()
         .collection('editorClassData')
-        .doc(value.classId)
+        .doc(value)
         .get()
       allowAccess.push({
-        classId: value.classId,
+        classId: value,
         schoolName: editorClassData.get('schoolName'),
         className: classData.get('className')
       })
@@ -141,10 +138,10 @@ export class UserStore extends VuexModule implements User {
   public async logout() {
     await firebase.auth().signOut()
     this.setUser({
-      uid: null,
-      email: null,
+      uid: '',
+      email: '',
       emailVerified: false,
-      displayName: null,
+      displayName: '',
       allowAccess: []
     })
   }