Replace Object.assign with angular.extend

sahat · Jul 19, 2016 · 4ee574c · 4ee574c
1 parent 3869606
commit 4ee574c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/oauth1.ts b/src/oauth1.ts
@@ -27,7 +27,7 @@ export interface IOAuth1Options {
 
 export default class OAuth1 implements IOAuth1 {
  static $inject = ['$http', '$window', 'SatellizerConfig', 'SatellizerPopup'];
- 
+
  private defaults: IOAuth1Options;
 
  constructor(private $http: angular.IHttpService,
@@ -50,7 +50,7 @@ export default class OAuth1 implements IOAuth1 {
  };
 
  init(options: IOAuth1Options, userData: any): angular.IHttpPromise<any> {
- Object.assign(this.defaults, options);
+ angular.extend(this.defaults, options);
 
  if (!this.$window['cordova']) {
  this.SatellizerPopup.open('about:blank', options.name, options.popupOptions);
@@ -81,7 +81,7 @@ export default class OAuth1 implements IOAuth1 {
  }
 
  exchangeForToken(oauthData, userData): angular.IHttpPromise<any> {
- const payload = Object.assign({}, userData, oauthData);
+ const payload = angular.extend({}, userData, oauthData);
  const exchangeForTokenUrl = this.SatellizerConfig.baseUrl ? joinUrl(this.SatellizerConfig.baseUrl, this.defaults.url) : this.defaults.url;
  return this.$http.post(exchangeForTokenUrl, payload, { withCredentials: this.SatellizerConfig.withCredentials });
  }

diff --git a/src/oauth2.ts b/src/oauth2.ts
@@ -67,7 +67,7 @@ export default class OAuth2 {
 
  init(options: IOAuth2Options, userData: any): Promise<any> {
  return new Promise((resolve, reject) => {
- Object.assign(this.defaults, options);
+ angular.extend(this.defaults, options);
 
  this.$timeout(() => {
  const stateName = this.defaults.name + '_state';
@@ -103,7 +103,7 @@ export default class OAuth2 {
  }
 
  exchangeForToken(oauthData: { code?, state? }, userData: any): angular.IHttpPromise<any> {
- const payload = Object.assign({}, userData);
+ const payload = angular.extend({}, userData);
 
  angular.forEach(this.defaults.responseParams, (value, key) => {
  switch (key) {

diff --git a/src/popup.ts b/src/popup.ts
@@ -13,7 +13,7 @@ export default class Popup implements IPopup {
  public popup: any;
  private url: string;
  private defaults: { redirectUri: string };
- 
+
  constructor(private $interval: angular.IIntervalService,
  private $window: angular.IWindowService) {
  this.popup = null;
@@ -78,7 +78,7 @@ export default class Popup implements IPopup {
  if (this.popup.location.search || this.popup.location.hash) {
  const query = parseQueryString(this.popup.location.search.substring(1).replace(/\/$/, ''));
  const hash = parseQueryString(this.popup.location.hash.substring(1).replace(/[\/$]/, ''));
- const params = Object.assign({}, query, hash);
+ const params = angular.extend({}, query, hash);
 
  if (params.error) {
  reject(new Error(params.error));
@@ -117,7 +117,7 @@ export default class Popup implements IPopup {
  if (parser.search || parser.hash) {
  const query = parseQueryString(parser.search.substring(1).replace(/\/$/, ''));
  const hash = parseQueryString(parser.hash.substring(1).replace(/[\/$]/, ''));
- const params = Object.assign({}, query, hash);
+ const params = angular.extend({}, query, hash);
 
  if (params.error) {
  reject(new Error(params.error));