fix(database): make database work with new Firebase SDK

Author: davideast

src/database/database.ts

@@ -1,5 +1,6 @@
 import {Inject, Injectable} from '@angular/core';
-import {FirebaseUrl} from '../tokens';
+import {FirebaseConfig} from '../tokens';
+import {FirebaseAppConfig} from '../angularfire2';
 import {FirebaseListObservable} from '../utils/firebase_list_observable';
 import {FirebaseObjectObservable} from '../utils/firebase_object_observable';
 import {FirebaseListFactory, FirebaseListFactoryOpts} from '../utils/firebase_list_factory';
@@ -8,25 +9,26 @@ import * as utils from '../utils/utils'
 
 @Injectable()
 export class FirebaseDatabase {
-  constructor(@Inject(FirebaseUrl) private fbUrl:string) {}
-  list (urlOrRef:string | Firebase, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
+  constructor(@Inject(FirebaseConfig) private fbConfig:FirebaseAppConfig) {}
+  list (urlOrRef:string | firebase.database.Reference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
     return utils.checkForUrlOrFirebaseRef(urlOrRef, {
-      isUrl: () => FirebaseListFactory(getAbsUrl(this.fbUrl, <string>urlOrRef), opts),
-      isRef: () => FirebaseListFactory(<Firebase>urlOrRef)
+      isUrl: () => FirebaseListFactory(getAbsUrl(this.fbConfig, <string>urlOrRef), opts),
+      isRef: () => FirebaseListFactory(<firebase.database.Reference>urlOrRef)
     });
   }
-  object(urlOrRef: string | Firebase, opts?:FirebaseObjectFactoryOpts):FirebaseObjectObservable<any> {
+  object(urlOrRef: string | firebase.database.Reference, opts?:FirebaseObjectFactoryOpts):FirebaseObjectObservable<any> {
     return utils.checkForUrlOrFirebaseRef(urlOrRef, {
-      isUrl: () => FirebaseObjectFactory(getAbsUrl(this.fbUrl, <string>urlOrRef), opts),
+      isUrl: () => FirebaseObjectFactory(getAbsUrl(this.fbConfig, <string>urlOrRef), opts),
       isRef: () => FirebaseObjectFactory(urlOrRef)
     });
   }
 }
 
-function getAbsUrl (root:string, url:string) {
+function getAbsUrl (root:FirebaseAppConfig, url:string) {
   if (!(/^[a-z]+:\/\/.*/.test(url))) {
     // Provided url is relative.
-    url = root + url;
+    // Strip any leading slash
+    url = root.databaseURL + '/' + utils.stripLeadingSlash(url);
   }
   return url;
-}
+}