API,AuthをwithSSRContextから引っ張るように修正

kaizumaki · kaizumaki · commit e2684f7740c4 · 2021-05-31T12:02:26.000+09:00
diff --git a/src/middleware/authenticated.ts b/src/middleware/authenticated.ts
@@ -1,7 +1,8 @@
 import { Middleware } from '@nuxt/types'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 
 const authenticated: Middleware = async ({ redirect }) => {
+  const { Auth } = withSSRContext()
   const userInfo = await Auth.currentUserInfo()
 
   if (!userInfo) {
diff --git a/src/pages/index.vue b/src/pages/index.vue
@@ -109,7 +109,7 @@
 import Vue from 'vue'
 import BaseInputField from '@/components/BaseInputField.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
-import { API, Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api'
 // import { getClass } from '@/graphql/queries'
 import { GetClassQuery } from '@/API'
@@ -138,6 +138,7 @@ export default Vue.extend({
     }
   },
   async mounted() {
+    const { Auth } = withSSRContext()
     const userInfo = await Auth.currentUserInfo()
     this.isLoggedIn = !!userInfo
   },
@@ -152,6 +153,7 @@ export default Vue.extend({
           }
         }
       `
+      const { API } = withSSRContext()
       try {
         const result = (await API.graphql({
           query: getClassSimple,
diff --git a/src/pages/user/classlist.vue b/src/pages/user/classlist.vue
@@ -52,7 +52,7 @@
 import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
-import { Auth, API } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 import { GraphQLResult } from '@aws-amplify/api'
 import { vxm } from '@/store'
 import { ListClasssQuery } from '@/API'
@@ -75,6 +75,7 @@ export default Vue.extend({
     }
   },
   async created() {
+    const { API, Auth } = withSSRContext()
     const user = await Auth.currentAuthenticatedUser()
     const listClasssSimple = /* GraphQL */ `
       query ListClasss(
diff --git a/src/pages/user/editUserEmail.vue b/src/pages/user/editUserEmail.vue
@@ -55,7 +55,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 import { vxm } from '~/store'
 
 type Data = {
@@ -93,6 +93,7 @@ export default Vue.extend<Data, Methods, Computed, unknown>({
   methods: {
     async doSave(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       const user = await Auth.currentAuthenticatedUser()
       if (user) {
         if (this.email !== this.currentEmail) {
diff --git a/src/pages/user/editUserName.vue b/src/pages/user/editUserName.vue
@@ -54,7 +54,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 import { vxm } from '~/store'
 
 type Data = {
@@ -92,6 +92,7 @@ export default Vue.extend<Data, Methods, Computed, unknown>({
   methods: {
     async doSave(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       const user = await Auth.currentAuthenticatedUser()
       if (user) {
         if (this.name !== this.currentName) {
diff --git a/src/pages/user/editUserPassword.vue b/src/pages/user/editUserPassword.vue
@@ -79,7 +79,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 
 type Data = {
   currentPassword: string
@@ -145,6 +145,7 @@ export default Vue.extend<Data, Methods, Computed, unknown>({
   methods: {
     async doSave(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       const user = await Auth.currentAuthenticatedUser()
       if (user) {
         if (this.newPassword) {
diff --git a/src/pages/user/login.vue b/src/pages/user/login.vue
@@ -66,7 +66,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 // import { vxm } from '@/store'
 
 export default Vue.extend({
@@ -92,6 +92,7 @@ export default Vue.extend({
   methods: {
     async doLogin(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       try {
         await Auth.signIn(this.email, this.password)
         // await vxm.user.login()
diff --git a/src/pages/user/logout.vue b/src/pages/user/logout.vue
@@ -14,7 +14,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 import { vxm } from '@/store'
 
 export default Vue.extend({
@@ -32,6 +32,7 @@ export default Vue.extend({
   methods: {
     async doLogout(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       try {
         await Auth.signOut()
         await vxm.app.resetDate()
diff --git a/src/pages/user/signup.vue b/src/pages/user/signup.vue
@@ -90,7 +90,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 
 export default Vue.extend({
   components: { BaseBottomSheetLayer, BaseActionButton, BaseInputField },
@@ -142,6 +142,7 @@ export default Vue.extend({
   methods: {
     async doSignUp(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       await Auth.signUp({
         username: this.email,
         password: this.password,
diff --git a/src/pages/user/verify.vue b/src/pages/user/verify.vue
@@ -66,7 +66,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 
 export default Vue.extend({
   components: { BaseBottomSheetLayer, BaseActionButton, BaseInputField },
@@ -91,6 +91,7 @@ export default Vue.extend({
   methods: {
     async doVerify(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       await Auth.confirmSignUp(this.email, this.verification_code)
         .then(() => {
           this.$router.push(this.localePath('/user/classlist'))
diff --git a/src/pages/user/verifyNewEmail.vue b/src/pages/user/verifyNewEmail.vue
@@ -66,7 +66,7 @@ import Vue from 'vue'
 import BaseBottomSheetLayer from '@/components/BaseBottomSheetLayer.vue'
 import BaseActionButton from '@/components/BaseActionButton.vue'
 import BaseInputField from '@/components/BaseInputField.vue'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 
 export default Vue.extend({
   components: { BaseBottomSheetLayer, BaseActionButton, BaseInputField },
@@ -92,6 +92,7 @@ export default Vue.extend({
   methods: {
     async doVerify(): Promise<void> {
       this.loading = true
+      const { Auth } = withSSRContext()
       await Auth.verifyCurrentUserAttributeSubmit(
         'email',
         this.verification_code
diff --git a/src/store/modules/classData.ts b/src/store/modules/classData.ts
@@ -6,7 +6,7 @@ import {
 } from 'vuex-class-component'
 import { AppStore } from '@/store/modules/app'
 import classData from '@/types/store/classData'
-import { API, Auth, graphqlOperation } from 'aws-amplify'
+import { withSSRContext, graphqlOperation } from 'aws-amplify'
 import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api'
 import {
   createSchool,
@@ -136,6 +136,7 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
 
   @action
   public async lessonsOnCurrentDate(date: Date) {
+    const { API } = withSSRContext()
     const lessons = (await API.graphql({
       query: listLessonsByClassSimple,
       variables: {
@@ -209,6 +210,7 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
         }
       }
     `
+    const { API } = withSSRContext()
     const lessons = (await API.graphql({
       query: listLessonsByClassSimple,
       variables: {
@@ -229,6 +231,7 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
 
   @action
   public async loadClassData(classId: classData.ClassId) {
+    const { API } = withSSRContext()
     const result = (await API.graphql({
       query: getClassSimple,
       variables: { id: classId },
@@ -256,6 +259,8 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
     schoolName: string
     locale: string
   }) {
+    const { API, Auth } = withSSRContext()
+
     if (!vxm.user.isAuthenticated) {
       throw new Error('ユーザーが正しくログインされていません')
     }
@@ -305,6 +310,7 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
 
   @action
   public async registerLesson(lessonData: classData.Lesson) {
+    const { API, Auth } = withSSRContext()
     try {
       const user = await Auth.currentAuthenticatedUser()
       await API.graphql(
@@ -330,6 +336,7 @@ export class ClassDataStore extends VuexModule implements classData.ClassData {
     editData: any
     id: classData.LessonId
   }) {
+    const { API } = withSSRContext()
     try {
       await API.graphql(
         graphqlOperation(updateLesson, {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
@@ -1,5 +1,5 @@
 import { createModule, action, mutation } from 'vuex-class-component'
-import { Auth } from 'aws-amplify'
+import { withSSRContext } from 'aws-amplify'
 
 const VuexModule = createModule({
   namespaced: 'user',
@@ -28,6 +28,7 @@ export class UserStore extends VuexModule implements User {
   displayName: DisplayName = ''
 
   public get isAuthenticated(): Promise<boolean> {
+    const { Auth } = withSSRContext()
     return (async () => {
       return await Auth.currentAuthenticatedUser()
         .then(() => true)
@@ -44,6 +45,7 @@ export class UserStore extends VuexModule implements User {
 
   @action
   public async login() {
+    const { Auth } = withSSRContext()
     const user = await Auth.currentAuthenticatedUser()
     this.setUser({
       email: user.attributes.email,
@@ -63,6 +65,7 @@ export class UserStore extends VuexModule implements User {
 
   @action
   public async logout() {
+    const { Auth } = withSSRContext()
     await Auth.signOut()
     this.setUser({
       email: '',

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`	`import Vue from 'vue'`
`110`	`110`	`import BaseInputField from '@/components/BaseInputField.vue'`
`111`	`111`	`import BaseActionButton from '@/components/BaseActionButton.vue'`
`112`		`-import { API, Auth } from 'aws-amplify'`
	`112`	`+import { withSSRContext } from 'aws-amplify'`
`113`	`113`	`import { GRAPHQL_AUTH_MODE, GraphQLResult } from '@aws-amplify/api'`
`114`	`114`	`// import { getClass } from '@/graphql/queries'`
`115`	`115`	`import { GetClassQuery } from '@/API'`
`@@ -138,6 +138,7 @@ export default Vue.extend({`
`138`	`138`	`}`
`139`	`139`	`},`
`140`	`140`	`async mounted() {`
	`141`	`+ const { Auth } = withSSRContext()`
`141`	`142`	`const userInfo = await Auth.currentUserInfo()`
`142`	`143`	`this.isLoggedIn = !!userInfo`
`143`	`144`	`},`
`@@ -152,6 +153,7 @@ export default Vue.extend({`
`152`	`153`	`}`
`153`	`154`	`}`
`154`	`155`	`
	`156`	`+ const { API } = withSSRContext()`
`155`	`157`	`try {`
`156`	`158`	`const result = (await API.graphql({`
`157`	`159`	`query: getClassSimple,`