Jkmarx/update client to invite api v2 (#3317)

* Update client. * Add unit tests. * Fix comment. * Update delete call. * Remove tasty pie. (#3318)
refinery-platform · Apr 9, 2019 · cd37998 · cd37998
1 parent 5e378d3
commit cd37998
Show file tree

Hide file tree

Showing 11 changed files with 211 additions and 226 deletions.
diff --git a/refinery/config/settings/base.py b/refinery/config/settings/base.py
@@ -189,8 +189,6 @@ def get_setting(name, settings=local_settings, default=None):
     'haystack',
     # NG: added for celery (task queue)
     'djcelery',  # django-celery
-    # NG: added for API
-    "tastypie",
     'djangular',
     'galaxy_connector',
     'analysis_manager',

diff --git a/refinery/config/urls.py b/refinery/config/urls.py
@@ -6,10 +6,8 @@
 from django.contrib import admin
 
 from registration.backends.default.views import ActivationView
-from tastypie.api import Api
 
 from config.utils import RouterCombiner
-from core.api import InvitationResource
 from core.forms import RegistrationFormWithCustomFields
 from core.models import AuthenticationFormUsernameOrEmail
 from core.urls import core_router
@@ -23,11 +21,6 @@
 
 logger = logging.getLogger(__name__)
 
-# NG: added for tastypie URL
-v1_api = Api(api_name='v1')
-
-v1_api.register(InvitationResource())
-
 
 # patterns for all of the different applications
 urlpatterns = patterns(
@@ -87,9 +80,6 @@
 
     url(r'^accounts/', include('registration.backends.default.urls')),
 
-    # NG: tastypie API urls
-    url(r'^api/', include(v1_api.urls)),
-
     user_files_url,
     user_files_csv_url
 

diff --git a/refinery/core/api.py b/refinery/core/api.py
diff --git a/refinery/core/test_api.py b/refinery/core/test_api.py
diff --git a/refinery/ui/source/js/commons/ctrls/group-member-add-modal-ctrl.js b/refinery/ui/source/js/commons/ctrls/group-member-add-modal-ctrl.js
@@ -66,8 +66,8 @@
       vm.responseMessage = '';
       vm.isLoading = true;
       groupInviteService.send({
-        email: vm.form.email,
-        group_id: vm.resolve.config.group.id
+        recipient_email: vm.form.email,
+        group_uuid: vm.resolve.config.group.uuid
       })
       .$promise
       .then(

diff --git a/refinery/ui/source/js/commons/services/group-invite.js b/refinery/ui/source/js/commons/services/group-invite.js
@@ -1,28 +1,39 @@
-'use strict';
+/**
+ * Invitation V2 Service
+ * @namespace invitationV2Service
+ * @desc Service to query, send, resend, and delete invites
+ * @memberOf refineryApp
+ */
+(function () {
+  'use strict';
 
-angular
-  .module('refineryApp')
-  .factory('groupInviteService', ['$resource', 'settings',
-    function ($resource, settings) {
-      return $resource(
-        settings.appRoot + settings.refineryApi + '/invitations/:token/',
-        {
-          token: '@token',
-          format: 'json'
+  angular
+    .module('refineryApp')
+    .factory('groupInviteService', groupInviteService);
+
+  groupInviteService.$inject = ['$resource', 'settings'];
+
+  function groupInviteService ($resource, settings) {
+    var invites = $resource(
+      settings.appRoot + settings.refineryApiV2 + '/invitations/:id/',
+      {
+        id: '@id'
+      },
+      {
+        query: {
+          method: 'GET',
+          isArray: true
+        },
+        send: {
+          method: 'POST'
+        },
+        resend: {
+          method: 'PATCH'
         },
-        {
-          query: {
-            method: 'GET'
-          },
-          send: {
-            method: 'POST'
-          },
-          resend: {
-            method: 'PUT'
-          },
-          revoke: {
-            method: 'DELETE'
-          }
+        revoke: {
+          method: 'DELETE'
         }
-      );
-    }]);
+      });
+    return invites;
+  }
+})();