firebase project changed, readme updated

Author: AndrewJBateman

.firebaserc

@@ -1,5 +1,5 @@
 {
   "projects": {
-    "default": "ionic-angular-project-a9d42"
+    "default": "ionic-angular-pr-1565107344855"
   }
 }

README.md

@@ -19,7 +19,7 @@ Code taken from course.
 * App to view and book places to stay. All places listed on the 'discover.page' and clicking on an item navigates to a place detail page using the place id in the browser.
 * Places are displayed under 2 list option: 'ALL PLACES' and 'BOOKABLE PLACES'. The first place is displayed using an ion-card, the remaining places are displayed using a list with a thumbnail image. There is code to prevent the user from being able to book their own places, using a userId matching function.
 * Places can be booked, listed and cancelled.
-* New places can be added. The location of the new place is chosen using google maps and is stored in the Places array to be displayed in the template using data-binding. A photo can be taken to add to the new Place description. If there is no camera then there is a file upload button to save a jpeg image.
+* New places can be added. The location of the new place is chosen using google maps and is displayed in the template using data-binding. A photo can be taken to add to the new Place description. If there is no camera then there is a file upload button to save a jpeg image.
 * Burger side panel added with links to the discover places listings, your bookings and a logout button.
 * Bottom menu with 2 links to 'Discover' (default page upon loading) and 'Offers' that lists all the places available.
 
@@ -104,11 +104,12 @@ private getGoogleMaps(): Promise<any> {
 * [Capacitor Camera API](https://capacitor.ionicframework.com/docs/apis/camera) used to provide camera functionality.
 * [Firebase Auth API](https://firebase.google.com/docs/reference/rest/auth) used to control access to app.
 * [Cordova Local Storage](https://cordova.apache.org/docs/en/latest/cordova/storage/storage.html#localstorage) to save user user authentication token so a refresh etc. does not lose a user's settings.
+* [Google Cloud Storage](https://www.npmjs.com/package/@google-cloud/storage) used for storage of image data.
 * Auth tokens on the backend.
 
 ## Status & To-do list
 
-* Status: Working but missing functionality.
+* Status: issue with auth token means user is logged out immediately. New database used which is currently empty.
 * To-do: complete course
 
 ## Inspiration

functions/index.js

@@ -9,22 +9,14 @@ const uuid = require('uuid/v4');
 const { Storage } = require('@google-cloud/storage');
 
 const storage = new Storage({
-  projectId: 'ionic-angular-project-a9d42'
+  projectId: 'ionic-angular-pr-1565107344855'
 });
 
 exports.storeImage = functions.https.onRequest((req, res) => {
   return cors(req, res, () => {
     if (req.method !== 'POST') {
       return res.status(500).json({ message: 'Not allowed.' });
     }
-
-    if (!req.headers.authorizaton || !req.headers.authorizaton.startsWith('Bear ')) {
-      return res.status(401).json({ error: 'Unauthorized' });
-    }
-
-    let idToken;
-    idToken = req.headers.authorization.split('Bearer ')[1];
-
     const busboy = new Busboy({ headers: req.headers });
     let uploadData;
     let oldImagePath;
@@ -46,29 +38,25 @@ exports.storeImage = functions.https.onRequest((req, res) => {
         imagePath = oldImagePath;
       }
 
-      return fbAdmin
-        .auth()
-        .verifyIdToken(idToken)
-        .then(decodedToken => {
-          console.log(uploadData.type);
-          return storage
-            .bucket('ionic-angular-project-a9d42.appspot.com')
-            .upload(uploadData.filePath, {
-              uploadType: 'media',
-              destination: imagePath,
-              metadata: {
-                metadata: {
-                  contentType: uploadData.type,
-                  firebaseStorageDownloadTokens: id
-                }
-              }
-            })
+      console.log(uploadData.type);
+      return storage
+        .bucket('ionic-angular-pr-1565107344855.appspot.com')
+        .upload(uploadData.filePath, {
+          uploadType: 'media',
+          destination: imagePath,
+          metadata: {
+            metadata: {
+              contentType: uploadData.type,
+              firebaseStorageDownloadTokens: id
+            }
+          }
         })
+
         .then(() => {
           return res.status(201).json({
             imageUrl:
               'https://firebasestorage.googleapis.com/v0/b/' +
-              storage.bucket('ionic-angular-project-a9d42.appspot.com').name +
+              storage.bucket('ionic-angular-pr-1565107344855.appspot.com').name +
               '/o/' +
               encodeURIComponent(imagePath) +
               '?alt=media&token=' +

functions/package-lock.json

@@ -12,12 +12,12 @@
     "node": "8"
   },
   "dependencies": {
-    "@google-cloud/storage": "^3.0.4",
-    "busboy": "^0.3.1",
-    "cors": "^2.8.5",
     "firebase-admin": "^8.0.0",
     "firebase-functions": "^3.1.0",
-    "uuid": "^3.3.2"
+    "@google-cloud/storage": "3.1.0",
+    "busboy": "0.3.1",
+    "cors": "2.8.5",
+    "uuid": "3.3.2"
   },
   "devDependencies": {
     "firebase-functions-test": "^0.1.6"

functions/package.json

@@ -40,6 +40,7 @@ export class AuthPage implements OnInit {
 				}
 				authObs.subscribe(
 					resData => {
+						console.log(resData);
 						this.isLoading = false;
 						loadingEl.dismiss();
 						this.router.navigateByUrl('/places/tabs/discover');

src/app/auth/auth.page.ts

@@ -8,11 +8,12 @@ import { environment } from '../../environments/environment';
 import { User } from './user.model';
 
 export interface AuthResponseData {
+	kind: string;
 	idToken: string;
 	email: string;
 	refreshToken: string;
-	expiresIn: string;
 	localId: string;
+	expiresIn: string;
 	registered?: boolean;
 }
 
@@ -157,8 +158,7 @@ export class AuthService implements OnDestroy {
 				userData.email,
 				userData.idToken,
 				expirationTime
-			)
-		;
+		);
 		this._user.next(user);
 		this.autoLogout(user.tokenDuration);
 		this.storeAuthData(
@@ -181,6 +181,7 @@ export class AuthService implements OnDestroy {
 			tokenExpirationDate,
 			email
 		});
+		console.log('auth data: ', data);
 		Plugins.Storage.set({ key: 'authData', value: data });
 	}
 }