@girder/core 3.1.23 → 3.2.0

package/auth.js

@@ -8,6 +8,7 @@ import { restRequest } from '@girder/core/rest';
 // girder.corsAuth could be an override. See login doc below.
 var corsAuth = false;
 
+// TODO delete in next major version
 var cookie = {
     findAll: function () {
         var cookies = {};
@@ -43,7 +44,7 @@ var cookie = {
 };
 
 var currentUser = null;
-var currentToken = cookie.find('girderToken');
+var currentToken = window.localStorage.getItem('girderToken');
 
 function getCurrentUser() {
     return currentUser;
@@ -110,11 +111,7 @@ function login(username, password, cors = corsAuth, otpToken = null) {
         setCurrentUser(new UserModel(response.user));
         setCurrentToken(response.user.token.token);
 
-        if (cors && !cookie.find('girderToken')) {
-            // For cross-origin requests, we should write the token into
-            // this document's cookie also.
-            document.cookie = 'girderToken=' + getCurrentToken();
-        }
+        window.localStorage.setItem('girderToken', response.user.token.token);
 
         events.trigger('g:login.success', response.user);
         events.trigger('g:login', response);
@@ -133,6 +130,8 @@ function logout() {
         setCurrentUser(null);
         setCurrentToken(null);
 
+        window.localStorage.removeItem('girderToken');
+
         events.trigger('g:login', null);
         events.trigger('g:logout.success');
     }).fail(function (jqxhr) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@girder/core",
-    "version": "3.1.23",
+    "version": "3.2.0",
     "description": "Extensible data management platform",
     "homepage": "https://girder.readthedocs.org",
     "bugs": {
@@ -25,7 +25,7 @@
         "qrcode": "~1.4.4",
         "remarkable": "^2.0.0",
         "sprintf-js": "^1.1.2",
-        "swagger-ui": "^2.2.10",
+        "swagger-ui-dist": "^5.7.2",
         "typeface-open-sans": "^0.0.75",
         "underscore": "^1.13.6",
         "url-otpauth": "^2.0.0"

package/rest.js

@@ -3,7 +3,7 @@ import _ from 'underscore';
 import Backbone from 'backbone';
 
 import events from '@girder/core/events';
-import { getCurrentToken, cookie } from '@girder/core/auth';
+import { getCurrentToken, setCurrentUser, setCurrentToken } from '@girder/core/auth';
 
 let apiRoot;
 var uploadHandlers = {};
@@ -70,11 +70,13 @@ const restRequest = function (opts) {
     const defaults = {
         // the default 'method' is 'GET', as set by 'jquery.ajax'
 
-        girderToken: getCurrentToken() || cookie.find('girderToken'),
+        girderToken: getCurrentToken() || window.localStorage.getItem('girderToken'),
 
         error: (error, status) => {
             let info;
             if (error.status === 401) {
+                setCurrentUser(null);
+                setCurrentToken(null);
                 events.trigger('g:loginUi');
                 info = {
                     text: 'You must log in to view this resource',

package/stylesheets/apidocs/apidocs.styl

@@ -6,6 +6,7 @@ $border = 1px solid #d7d7d7
 body
   font-family "Open Sans", sans-serif
   background-color #adada1
+  margin 0
 
 .right
   float right
@@ -29,7 +30,7 @@ body
   padding 5px 18px 12px
   border-top $border
 
-@media screen and (min-width: 990px)
+@media screen and (min-width 990px)
   .docs-header
   .docs-body
   .docs-swagger-container

package/stylesheets/body/groupPage.styl

@@ -34,10 +34,17 @@
   > a
     font-weight bold
 
-.g-group-members-container, .g-group-requests-container, .g-group-admins-container, .g-group-mods-container
+.g-group-members-container
+.g-group-requests-container
+.g-group-admins-container
+.g-group-mods-container
   margin-top 15px
 
-.g-group-members, .g-group-mods, .g-group-admins, .g-group-requests, .g-group-invites
+.g-group-members
+.g-group-mods
+.g-group-admins
+.g-group-requests
+.g-group-invites
   list-style-type none
   padding 0
   margin-bottom 20px
@@ -57,7 +64,8 @@
   margin 5px 0
 
 .g-group-member-controls
-  >a, span>a
+  >a
+  span>a
     font-size 15px
     margin-left 4px
     border 1px solid #d5d5d5

package/stylesheets/body/itemPage.styl

@@ -11,10 +11,12 @@
   font-size 14px
   float right
 
-.g-item-files, .g-item-metadata
+.g-item-files
+.g-item-metadata
   margin-top 20px
 
-.g-item-files-header, .g-item-info-header
+.g-item-files-header
+.g-item-info-header
   background-color #f0f0f0
   padding 5px 6px
   color #555
@@ -27,7 +29,7 @@
   background-color #fbfbfb
 
 .editing
-  background-color #C6DEFF
+  background-color #c6deff
 
 .g-file-list
   list-style-type none

package/stylesheets/body/systemConfig.styl

@@ -1,9 +1,9 @@
 .g-settings-form
   margin-top 10px
 
-  .bootstrap-switch-handle-on,
+  .bootstrap-switch-handle-on
   .bootstrap-switch-handle-off
-      word-wrap normal
+    word-wrap normal
 
 #g-core-banner-color
   display inline
@@ -51,5 +51,6 @@
         margin-bottom 0
 
   .g-search-container
-    .g-search-wrapper, input[type="text"]
+    .g-search-wrapper
+    input[type="text"]
       width 200px

package/stylesheets/body/userAccount.styl

@@ -51,7 +51,7 @@
     margin-top 10px
 
 .g-scope-selection-container .checkbox
-    margin-left 25px
+  margin-left 25px
 
-    &.disabled
-      color #999
+  &.disabled
+    color #999

package/stylesheets/body/userList.styl

@@ -30,7 +30,8 @@
     float right
     color #909090
 
-  .g-user-joined-date, .g-user-space-used
+  .g-user-joined-date
+  .g-user-space-used
     color #444
 
 .g-user-list-header

package/stylesheets/layout/global.styl

@@ -9,7 +9,7 @@ body
   word-wrap break-word
 
 i
-  font-smoothing antialiased
+  -webkit-font-smoothing antialiased
 
 a
   cursor pointer
@@ -65,11 +65,11 @@ ul.dropdown-menu
   padding 6px 8px
   border 1px solid #e5e2c8
 
-/* Augment the bootstrap tabs styling a bit */
+// Augment the bootstrap tabs styling a bit
 .nav-tabs>li:not(.active)>a
   border 1px solid #e2e2e2
 
-/* Personal preference for less white space at bottom of dialogs */
+// Personal preference for less white space at bottom of dialogs
 .modal-footer
   margin-top 5px
 
@@ -82,7 +82,7 @@ ul.dropdown-menu
 .modal-backdrop.in
   opacity 0.35
 
-/* By default bootstrap only applies form-inline rules at >=768px width */
+// By default bootstrap only applies form-inline rules at >=768px width
 .form-inline .form-group
   display inline-block
   margin-bottom 0
@@ -94,7 +94,7 @@ blockquote p
 code
   font-family monospace
 
-/* Don't show the vertical scroll bar when we show a dialog unless we must */
+// Don't show the vertical scroll bar when we show a dialog unless we must
 .modal
   overflow-y auto
 
@@ -112,7 +112,7 @@ code
 textarea
   max-width 100%
 
-/* Stuff that applies across the top level object lists */
+// Stuff that applies across the top level object lists
 .g-top-level-list-title-container
   display inline-block
   overflow hidden

package/stylesheets/layout/globalNav.styl

@@ -47,7 +47,7 @@ ul.g-global-nav
     i
       color black
 
-@media (max-width: 720px)
+@media (max-width 720px)
   .g-nav-link
     display inline-block
     padding 0 10px 0 6px
@@ -69,7 +69,7 @@ ul.g-global-nav
     >li:not(.g-active)
       background-color #f1f1f1
 
-@media (min-width: 721px)
+@media (min-width 721px)
   ul.g-global-nav
     >li:hover:not(.g-active)
       .g-nav-link:after
@@ -81,7 +81,7 @@ ul.g-global-nav
         right -1px
         background-color #ffcc00
 
-@media (max-width: 720px)
+@media (max-width 720px)
   .g-global-nav-main
     padding 0
     box-shadow none

package/stylesheets/layout/header.styl

@@ -24,6 +24,6 @@
   display inline
   float right
 
-@media (max-width: 720px)
+@media (max-width 720px)
   .g-app-title
     display none

package/stylesheets/layout/layout.styl

@@ -54,7 +54,7 @@
   overflow hidden
   text-overflow ellipsis
 
-@media (min-width: 721px)
+@media (min-width 721px)
   #g-app-body-container.g-default-layout
     padding 10px + $headerHeight 10px 10px 10px
     margin-left $navWidth + 1px
@@ -64,7 +64,7 @@
     top $headerHeight
     width $navWidth
 
-@media (max-width: 720px)
+@media (max-width 720px)
   #g-global-nav-container
     width 100%
     position static

package/stylesheets/layout/loading.styl

@@ -1,4 +1,4 @@
-/* CSS for the loading animation */
+// CSS for the loading animation
 
 #g-loading-animation
   margin 4px

package/stylesheets/widgets/accessWidget.styl

@@ -47,7 +47,8 @@ i.g-flag-icon
   background linear-gradient(to bottom, #d3d3d3 0, #f0f0f0 6px)
   padding 1px 4px
 
-  .g-group-access-entry, .g-user-access-entry
+  .g-group-access-entry
+  .g-user-access-entry
     margin 9px 0
 
   .g-access-icon

package/stylesheets/widgets/hierarchyWidget.styl

@@ -4,7 +4,7 @@
   .g-hierarchy-sticky
     position sticky
     z-index 10
-  
+
   .g-hierarchy-actions-header
     background linear-gradient(to bottom, #e6e6e6 0, #f7f7f7 8px)
     padding 4px 5px 3px
@@ -37,13 +37,14 @@
           margin 0
           padding 0
           border-radius 4px
-        .g-page-next, .g-page-prev
+        .g-page-next
+        .g-page-prev
           a
             padding 8px 12px
         #g-page-selection-input
           margin-left 3px
           margin-right 3px
-      
+
 
   .g-hierarchy-breadcrumb-bar
     ol.breadcrumb
@@ -76,12 +77,14 @@
       user-select none
       cursor default
 
-      .g-subfolder-count-container, .g-item-count-container
+      .g-subfolder-count-container
+      .g-item-count-container
         display inline-block
         position relative
         margin-left 8px
 
-      .g-subfolder-count, .g-item-count
+      .g-subfolder-count
+      .g-item-count
         display inline-block
         border-radius 3px
         color black
@@ -92,11 +95,14 @@
         right -3px
         padding 0 0.3em
 
-  .g-folder-list-container, .g-item-list-container
+  .g-folder-list-container
+  .g-item-list-container
     position relative
     z-index 0
 
-  .g-folder-list, .g-item-list, .g-file-list
+  .g-folder-list
+  .g-item-list
+  .g-file-list
     margin 0
     padding 0
     list-style-type none
@@ -106,7 +112,8 @@
       box-sizing border-box
       padding 4px 5px 3px
 
-    >.g-folder-list-entry, >.g-item-list-entry
+    >.g-folder-list-entry
+    >.g-item-list-entry
       font-size 15px
 
       &:hover
@@ -127,7 +134,8 @@
       position relative
       top -1px
 
-  .g-checked-folder-count, .g-checked-item-count
+  .g-checked-folder-count
+  .g-checked-item-count
     margin-right 23px
 
   .g-level-up-button-container
@@ -144,7 +152,8 @@
         border 1px solid #aaa
         background-color #dadada
 
-  .g-item-size, .g-folder-privacy
+  .g-item-size
+  .g-folder-privacy
     display inline-block
     padding 1px 5px
     margin-left 10px
@@ -161,7 +170,9 @@
 .g-folder-metadata
   margin-top 20px
 
-.g-folder-info-line, .g-collection-info-line, .g-file-info-line
+.g-folder-info-line
+.g-collection-info-line
+.g-file-info-line
   color #808080
   margin-bottom 2px
   padding 2px 4px

package/stylesheets/widgets/metadataWidget.styl

@@ -13,7 +13,8 @@
   font-size 14px
   color #777
 
-.g-widget-metadata-key, .g-widget-metadata-value
+.g-widget-metadata-key
+.g-widget-metadata-value
   margin 5px
   display inline-block
   overflow hidden
@@ -48,7 +49,8 @@
   margin-left 5px
   margin-right 5px
 
-  .ace_editor, textarea
+  .ace_editor
+  textarea
     height 365px !important
 
 button.g-widget-metadata-add-button
@@ -64,7 +66,8 @@ button.g-widget-metadata-add-button
   padding 3px
 
 .g-widget-metadata-row.editing
-  .g-widget-metadata-key-input, .g-widget-metadata-value-input
+  .g-widget-metadata-key-input
+  .g-widget-metadata-value-input
     height 24px
     margin-left 5px
     margin-right 5px
@@ -77,7 +80,10 @@ button.g-widget-metadata-add-button
   .g-widget-metadata-value-input
     width 54%
 
-  .g-widget-metadata-cancel-button, .g-widget-metadata-save-button, .g-widget-metadata-delete-button, .g-widget-metadata-toggle-button
+  .g-widget-metadata-cancel-button
+  .g-widget-metadata-save-button
+  .g-widget-metadata-delete-button
+  .g-widget-metadata-toggle-button
     margin-right 4px
     margin-top 1px
     display inline-block

package/stylesheets/widgets/timelineWidget.styl

@@ -23,7 +23,8 @@ $height = 14px
     top -3px
     box-shadow 0 2px 4px rgba(0, 0, 0, 0.15)
 
-  .g-point-default, .g-segment-default
+  .g-point-default
+  .g-segment-default
     background-color #4c4
 
 .g-timeline-labels-container

package/stylesheets/widgets/uploadWidget.styl

@@ -1,9 +1,11 @@
-.g-current-progress-message, .g-overall-progress-message
+.g-current-progress-message
+.g-overall-progress-message
   color #737373
   margin-top 5px
   margin-bottom 5px
 
-.g-progress-current, .g-progress-overall
+.g-progress-current
+.g-progress-overall
   >.progress-bar
     transition none
 

package/stylesheets/widgets/userOtpManagementWidget.styl

@@ -1,5 +1,5 @@
 #g-account-tab-otp
-// Included parent ID to avoid using !important for style overrides
+  // Included parent ID to avoid using !important for style overrides
   .g-user-settings-container
     background none
     border none
@@ -13,10 +13,10 @@
     margin 0 20px 10px 0
     display inline-block
     &.g-user-otp-heading-enable
-      background #EFFFF0
-      border 1px solid #4CAF50
+      background #effff0
+      border 1px solid #4caf50
       border-radius 5px
-      color #4CAF50
+      color #4caf50
       font-size 26px
       padding 20px 26px
       &:before
@@ -121,7 +121,7 @@
         padding 16px 20px
         margin-top 12px
   .g-user-otp-footer
-    background-color #3F3B3B
+    background-color #3f3b3b
     border-radius 0 0 4px 4px
     padding 15px 20px 18px
     // clearfix
@@ -136,7 +136,7 @@
       font-size 20px
 
 // Responsive Goodness
-@media screen and (max-width:1156px)
+@media screen and (max-width 1156px)
   .g-account-otp-container
     .g-account-otp-steps
       .g-account-otp-step
@@ -146,7 +146,7 @@
               &:before
                 display none
 
-@media screen and (max-width:960px)
+@media screen and (max-width 960px)
   .g-account-otp-container
     .g-account-otp-steps
       .g-account-otp-step

package/views/layout/RegisterView.js

@@ -1,7 +1,7 @@
 import UserModel from '@girder/core/models/UserModel';
 import View from '@girder/core/views/View';
 import events from '@girder/core/events';
-import { getCurrentUser, setCurrentUser, getCurrentToken, setCurrentToken, corsAuth } from '@girder/core/auth';
+import { getCurrentUser, setCurrentUser, getCurrentToken, setCurrentToken } from '@girder/core/auth';
 import { handleClose, handleOpen } from '@girder/core/dialog';
 
 import RegisterDialogTemplate from '@girder/core/templates/layout/registerDialog.pug';
@@ -44,10 +44,7 @@ var RegisterView = View.extend({
                     if (authToken.token) {
                         setCurrentUser(user);
                         setCurrentToken(authToken.token);
-
-                        if (corsAuth) {
-                            document.cookie = 'girderToken=' + getCurrentToken();
-                        }
+                        window.localStorage.setItem('girderToken', getCurrentToken());
 
                         events.trigger('g:login');
                     } else {