[ENG-11025] V1 API for WB to V2 POC

addons/osfstorage/models.py

@@ -16,7 +16,7 @@
 from osf.utils import permissions
 from website.files import exceptions
 from website.files import utils as files_utils
-from website.util import api_url_for
+# from website.util import api_url_for
 from website import settings as website_settings
 from addons.osfstorage.settings import DEFAULT_REGION_ID
 from website.util import api_v2_url
@@ -608,12 +608,13 @@ def serialize_waterbutler_settings(self):
         return dict(Region.objects.get(id=self.region_id).waterbutler_settings, **{
             'nid': self.owner._id,
             'rootId': self.root_node._id,
-            'baseUrl': api_url_for(
-                'osfstorage_get_metadata',
-                guid=self.owner._id,
-                _absolute=True,
-                _internal=True
-            ),
+            'baseUrl': f'http://localhost:5000/api/v1/{self.owner._id}/osfstorage/'
+            # 'baseUrl': api_url_for(
+            #     'osfstorage_get_metadata',
+            #     guid=self.owner._id,
+            #     _absolute=True,
+            #     _internal=True
+            # ),
         })
 
     def serialize_waterbutler_credentials(self):
@@ -628,12 +629,13 @@ def create_waterbutler_log(self, auth, action, metadata):
         }
 
         if (metadata['kind'] != 'folder'):
-            url = self.owner.web_url_for(
-                'addon_view_or_download_file',
-                guid=self.owner._id,
-                path=metadata['path'],
-                provider='osfstorage'
-            )
+            url = 'url'
+            # url = self.owner.web_url_for(
+            #     'addon_view_or_download_file',
+            #     guid=self.owner._id,
+            #     path=metadata['path'],
+            #     provider='osfstorage'
+            # )
             params['urls'] = {'view': url, 'download': url + '?action=download'}
 
         self.owner.add_log(

api/files/urls.py

@@ -1,10 +1,18 @@
-from django.urls import re_path
+from django.urls import path, re_path
 
 from api.files import views
 
 app_name = 'osf'
 
 urlpatterns = [
+
+]
+
+urlpatterns = [
+    path('auth/', views.WaterbutlerAuthView.as_view(), name='WaterbutlerAuthView'),
+    path('project/<str:pid>/waterbutler/logs/', views.WaterbutlerLogView.as_view(), name='waterbutler-logs-project'),
+    path('project/<str:pid>/node/<str:nid>/waterbutler/logs/', views.WaterbutlerLogView.as_view(), name='waterbutler-logs-node'),
+
     re_path(r'^(?P<file_id>\w+)/$', views.FileDetail.as_view(), name=views.FileDetail.view_name),
     re_path(r'^(?P<file_id>\w+)/cedar_metadata_records/$', views.FileCedarMetadataRecordsList.as_view(), name=views.FileCedarMetadataRecordsList.view_name),
     re_path(r'^(?P<file_id>\w+)/versions/$', views.FileVersionsList.as_view(), name=views.FileVersionsList.view_name),