From 439990ba8fab17cbdbc607e76ed88a12ea524aeb Mon Sep 17 00:00:00 2001 From: Ondrej Zara Date: Tue, 2 Oct 2018 12:59:50 +0200 Subject: [PATCH] updated the firebase api/sdk --- index.html | 8 ++++--- my-mind.js | 52 +++++++++++++++++++++++++++++++---------- src/backend.firebase.js | 40 ++++++++++++++++++++++--------- src/promise.js | 12 +++++++++- 4 files changed, 85 insertions(+), 27 deletions(-) diff --git a/index.html b/index.html index c6f723d..9cf2d6c 100644 --- a/index.html +++ b/index.html @@ -6,8 +6,10 @@ My Mind - - + + + + @@ -930,7 +932,7 @@

- +

diff --git a/my-mind.js b/my-mind.js index f6ec6a9..9dac80c 100644 --- a/my-mind.js +++ b/my-mind.js @@ -50,7 +50,7 @@ var MM = { * @class A promise - value to be resolved in the future. * Implements the "Promises/A+" specification. */ -var Promise = function() { +var Promise = function(executor) { this._state = 0; /* 0 = pending, 1 = fulfilled, 2 = rejected */ this._value = null; /* fulfillment / rejection value */ @@ -60,6 +60,16 @@ var Promise = function() { } this._thenPromises = []; /* promises returned by then() */ + + executor && executor(this.fulfill.bind(this), this.reject.bind(this)); +} + +Promise.resolve = function(value) { + return new Promise().fulfill(value); +} + +Promise.reject = function(value) { + return new Promise().reject(value); } /** @@ -3382,7 +3392,18 @@ MM.Backend.Firebase = Object.create(MM.Backend, { }); MM.Backend.Firebase.connect = function(server, auth) { - this.ref = new Firebase("https://" + server + ".firebaseio.com/"); + // Initialize Firebase + var config = { + apiKey: "AIzaSyBO_6uCK8pHjoz1c9htVwZi6Skpm8o4LtQ", + authDomain: "my-mind.firebaseapp.com", + databaseURL: "https://" + server + ".firebaseio.com", + projectId: "firebase-my-mind", + storageBucket: "firebase-my-mind.appspot.com", + messagingSenderId: "666556281676" + }; + firebase.initializeApp(config); + + this.ref = firebase.database().ref(); this.ref.child("names").on("value", function(snap) { MM.publish("firebase-list", this, snap.val() || {}); @@ -3553,18 +3574,25 @@ MM.Backend.Firebase._valueChange = function(snap) { } MM.Backend.Firebase._login = function(type) { - var promise = new Promise(); + var provider; + switch (type) { + case "github": + provider = new firebase.auth.GithubAuthProvider(); + break; + case "facebook": + provider = new firebase.auth.FacebookAuthProvider(); + break; + case "twitter": + provider = new firebase.auth.TwitterAuthProvider(); + break; + case "google": + provider = new firebase.auth.GoogleAuthProvider(); + break; + } - var auth = new FirebaseSimpleLogin(this.ref, function(error, user) { - if (error) { - promise.reject(error); - } else if (user) { - promise.fulfill(user); - } + return firebase.auth().signInWithPopup(provider).then(function(result) { + return result.user; }); - auth.login(type); - - return promise; } MM.Backend.GDrive = Object.create(MM.Backend, { id: {value: "gdrive"}, diff --git a/src/backend.firebase.js b/src/backend.firebase.js index 7e80b88..8eb96e1 100644 --- a/src/backend.firebase.js +++ b/src/backend.firebase.js @@ -10,7 +10,18 @@ MM.Backend.Firebase = Object.create(MM.Backend, { }); MM.Backend.Firebase.connect = function(server, auth) { - this.ref = new Firebase("https://" + server + ".firebaseio.com/"); + // Initialize Firebase + var config = { + apiKey: "AIzaSyBO_6uCK8pHjoz1c9htVwZi6Skpm8o4LtQ", + authDomain: "my-mind.firebaseapp.com", + databaseURL: "https://" + server + ".firebaseio.com", + projectId: "firebase-my-mind", + storageBucket: "firebase-my-mind.appspot.com", + messagingSenderId: "666556281676" + }; + firebase.initializeApp(config); + + this.ref = firebase.database().ref(); this.ref.child("names").on("value", function(snap) { MM.publish("firebase-list", this, snap.val() || {}); @@ -181,16 +192,23 @@ MM.Backend.Firebase._valueChange = function(snap) { } MM.Backend.Firebase._login = function(type) { - var promise = new Promise(); + var provider; + switch (type) { + case "github": + provider = new firebase.auth.GithubAuthProvider(); + break; + case "facebook": + provider = new firebase.auth.FacebookAuthProvider(); + break; + case "twitter": + provider = new firebase.auth.TwitterAuthProvider(); + break; + case "google": + provider = new firebase.auth.GoogleAuthProvider(); + break; + } - var auth = new FirebaseSimpleLogin(this.ref, function(error, user) { - if (error) { - promise.reject(error); - } else if (user) { - promise.fulfill(user); - } + return firebase.auth().signInWithPopup(provider).then(function(result) { + return result.user; }); - auth.login(type); - - return promise; } diff --git a/src/promise.js b/src/promise.js index a1de39a..e0759a4 100644 --- a/src/promise.js +++ b/src/promise.js @@ -7,7 +7,7 @@ * @class A promise - value to be resolved in the future. * Implements the "Promises/A+" specification. */ -var Promise = function() { +var Promise = function(executor) { this._state = 0; /* 0 = pending, 1 = fulfilled, 2 = rejected */ this._value = null; /* fulfillment / rejection value */ @@ -17,6 +17,16 @@ var Promise = function() { } this._thenPromises = []; /* promises returned by then() */ + + executor && executor(this.fulfill.bind(this), this.reject.bind(this)); +} + +Promise.resolve = function(value) { + return new Promise().fulfill(value); +} + +Promise.reject = function(value) { + return new Promise().reject(value); } /**