Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 052f4a6

Browse files
committed
fix(firebaseRef): Do not return a modified firebase ref
1 parent 8132ec9 commit 052f4a6

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

src/firebaseAuthService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"use strict";
33

44
function FirebaseAuthService($firebaseAuth, firebaseRef) {
5-
return $firebaseAuth(firebaseRef);
5+
return $firebaseAuth(firebaseRef.default);
66
}
77
FirebaseAuthService.$inject = ['$firebaseAuth', 'firebaseRef'];
88

src/firebaseRef.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,13 @@
2323
};
2424

2525
this.$$createRefsFromUrlConfig = function $$createMultipleRefs(urlConfig) {
26+
var refs = {};
2627
var error = this.$$checkUrls(urlConfig);
2728
if (error) { throw error; }
28-
var defaultUrl = urlConfig.default;
29-
var defaultRef = new Firebase(defaultUrl);
30-
delete urlConfig.default;
3129
angular.forEach(urlConfig, function(value, key) {
32-
if (!defaultRef.hasOwnProperty(key)) {
33-
defaultRef[key] = new Firebase(value);
34-
} else {
35-
throw new Error(key + ' is a reserved property name on firebaseRef.');
36-
}
30+
refs[key] = new Firebase(value);
3731
});
38-
return defaultRef;
32+
return refs;
3933
};
4034

4135
this.$get = function FirebaseRef_$get() {

tests/unit/firebaseRef.spec.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ describe('firebaseRef', function () {
1212

1313
it('creates a single reference with a url', inject(function() {
1414
firebaseRefProvider.registerUrl(MOCK_URL);
15-
expect(firebaseRefProvider.$get()).toBeAFirebaseRef();
15+
expect(firebaseRefProvider.$get().default).toBeAFirebaseRef();
1616
}));
1717

1818
it('creates a default reference with a config object', inject(function() {
1919
firebaseRefProvider.registerUrl({
2020
default: MOCK_URL
2121
});
2222
var firebaseRef = firebaseRefProvider.$get();
23-
expect(firebaseRef).toBeAFirebaseRef();
23+
expect(firebaseRef.default).toBeAFirebaseRef();
2424
}));
2525

2626
it('creates multiple references with a config object', inject(function() {
@@ -29,7 +29,7 @@ describe('firebaseRef', function () {
2929
messages: MOCK_URL + 'messages'
3030
});
3131
var firebaseRef = firebaseRefProvider.$get();
32-
expect(firebaseRef).toBeAFirebaseRef();
32+
expect(firebaseRef.default).toBeAFirebaseRef();
3333
expect(firebaseRef.messages).toBeAFirebaseRef();
3434
}));
3535

@@ -41,16 +41,6 @@ describe('firebaseRef', function () {
4141
expect(errorWrapper).toThrow();
4242
}));
4343

44-
it('should throw an error when a reserved property is used', inject(function() {
45-
function errorWrapper() {
46-
firebaseRefProvider.registerUrl({
47-
path: 'hello'
48-
});
49-
firebaseRefProvider.$get();
50-
}
51-
expect(errorWrapper).toThrow();
52-
}));
53-
5444
});
5545

5646
});

0 commit comments

Comments
 (0)