unlinkUrl is now correctly concatenated with baseUrl

sahat · Jun 1, 2015 · f440efb · f440efb
1 parent 26f8ef3
commit f440efb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/satellizer.js b/satellizer.js
@@ -374,10 +374,11 @@
       '$q',
       '$http',
       'satellizer.config',
+      'satellizer.utils',
       'satellizer.shared',
       'satellizer.Oauth1',
       'satellizer.Oauth2',
-      function($q, $http, config, shared, Oauth1, Oauth2) {
+      function($q, $http, config, utils, shared, Oauth1, Oauth2) {
         var oauth = {};
 
         oauth.authenticate = function(name, redirect, userData) {
@@ -397,10 +398,12 @@
         };
 
         oauth.unlink = function(provider) {
+          var unlinkUrl =  config.baseUrl ? utils.joinUrl(config.baseUrl, config.unlinkUrl) : config.unlinkUrl;
+
           if (config.unlinkMethod === 'get') {
-            return $http.get(config.unlinkUrl + provider);
+            return $http.get(unlinkUrl + provider);
           } else if (config.unlinkMethod === 'post') {
-            return $http.post(config.unlinkUrl, provider);
+            return $http.post(unlinkUrl, provider);
           }
         };