Merge pull request #49 from rslvn/develop

rollback firebase upgrade

src/components/form/SetEmailPasswordForm.vue

@@ -77,7 +77,8 @@ export default class SetPasswordForm extends Vue {
   confirmedPassword = '';
 
   get description () {
-    return this.email ? this.$t('provider.linkPasswordProvider.passwordForm.description', { email: this.email })
+    return this.email
+      ? this.$t('provider.linkPasswordProvider.passwordForm.description', { email: this.email })
       : this.$t('provider.linkPasswordProvider.passwordForm.descriptionNoEmail')
   }
 

src/components/image/upload/SingleValidatedImageUpload.vue

@@ -18,6 +18,7 @@
 <script lang="ts">
 import { Component, Prop, Ref, Vue, Watch } from 'nuxt-property-decorator'
 import { ValidationProvider } from 'vee-validate'
+import firebase from 'firebase'
 import { ValidationResult } from 'vee-validate/dist/types/types'
 import { Image } from 'types-module'
 import { storage, TaskEvent, TaskState } from '~/plugins/fire-init-plugin'
@@ -83,7 +84,7 @@ export default class SingleFileUploadWithValidation extends Vue {
       this.handleFireStorageError,
       () => {
         return this.uploadTask?.snapshot.ref.getDownloadURL()
-          .then((downloadURL) => {
+          .then((downloadURL:string) => {
             const image: Image = {
               name: this.fileName,
               src: downloadURL,

src/package.json

@@ -75,7 +75,7 @@
     "cropperjs": "^1.5.9",
     "debounce": "^1.2.0",
     "dotenv": "^8.2.0",
-    "firebase": "^8.1.1",
+    "firebase": "^7.15.5",
     "firebase-admin": "^9.4.1",
     "handlers-module": "file:../functions/modules/handlers-module",
     "http-status-codes": "^2.1.4",

src/server/sitemap.ts

@@ -1,17 +1,6 @@
 import express, { Router } from 'express'
 import { sitemapHandler } from 'handlers-module'
 
-// const staticRoutes = [
-//   Routes.HOME.path,
-//   Routes.TERMS.path,
-//   Routes.PRIVACY_POLICY.path,
-//   Routes.REGISTER.path,
-//   Routes.LOGIN.path,
-//   Routes.CROP.path,
-//   Routes.LIGHT_BOX.path,
-//   Routes.IMAGES.path
-// ]
-
 const app = express()
 app.disable('x-powered-by')
 

src/service/firebase/firebase-service.ts

@@ -5,14 +5,16 @@ import { auth } from '~/plugins/fire-init-plugin'
 import { DefaultProfilePhoto } from '~/types'
 
 export const getProviderData = (userInfo: UserInfo|null|undefined): ProviderData|null => {
-  return userInfo ? {
-    providerType: userInfo.providerId as ProviderType,
-    displayName: userInfo.displayName,
-    email: userInfo.email,
-    phoneNumber: userInfo.phoneNumber,
-    photoURL: userInfo.photoURL,
-    uid: userInfo.uid
-  } : null
+  return userInfo
+    ? {
+      providerType: userInfo.providerId as ProviderType,
+      displayName: userInfo.displayName,
+      email: userInfo.email,
+      phoneNumber: userInfo.phoneNumber,
+      photoURL: userInfo.photoURL,
+      uid: userInfo.uid
+    }
+    : null
 }
 
 export const getAuthUser = (firebaseUser: User): AuthUser => {

src/service/global-service.ts

@@ -7,7 +7,8 @@ import { QueryParameters, Routes, RouteType } from '../types'
 const timestampFormat: string = 'MM/DD/YYYY HH:mm:ss.SSS'
 const slugDelimiter = '-'
 
-export const dashAllRegex = new RegExp('-', 'g')
+export const dashAllRegex = /-/g
+// new RegExp('-', 'g')
 
 export const generateUuid = () => {
   return uuidv4().replace(dashAllRegex, '')

src/service/seo-service.ts

@@ -1,3 +1,4 @@
+import { Vue } from 'nuxt-property-decorator'
 import { DefaultMeta, PageMeta, RouteType } from '~/types'
 
 const getHeadTitle = (routeType: RouteType, vue: Vue) => {

src/shim-ts.d.ts

@@ -0,0 +1,7 @@
+declare namespace Express {
+  export interface Request {
+    user: any;
+    nsSessionId: string;
+    nsRequestId: string;
+  }
+}

src/shims-vue.d.ts

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  // @ts-ignore
+  import Vue from 'vue'
+  export default Vue
+}

src/tsconfig.json

@@ -35,6 +35,7 @@
       "nuxt-i18n",
       "cookie-universal-nuxt",
       "firebase",
+      "firebase/app",
       "nuxt-property-decorator",
       "types-module",
       "handlers-module"