fix(accounts): manually grab user dir (#30)

issue with i assume company managed computers where the "current user"
is pointing to somewhere else (maybe the admin who installed sketchup?)

to solve, I'm manually grabbing the user dir from the pwd

closes Auth error and no streams found #27

speckle_connector/accounts.rb

@@ -5,7 +5,6 @@ begin
 rescue LoadError
   # ty msp-greg! https://github.com/MSP-Greg/SUMisc/releases/tag/sqlite3-mingw-1
   Gem.install(File.join(File.dirname(File.expand_path(__FILE__)), "utils/sqlite3-1.4.2.mspgreg-x64-mingw32.gem"))
-else
   require("sqlite3")
 end
 
@@ -35,7 +34,8 @@ module SpeckleSystems::SpeckleConnector
     def self._get_speckle_dir
       speckle_dir =
         case Sketchup.platform
-        when :platform_win then File.join(Dir.home, "AppData/Roaming/Speckle")
+        # sometimes Dir.home on windows points somewhere else bc I guess it's picking up a higher level user?
+        when :platform_win then File.join(Dir.pwd[%r{^((?:[^/]*/){3})}], "AppData/Roaming/Speckle")
         when :platform_osx then File.join(Dir.home, ".config", "Speckle")
         else
           nil

ui/package.json

@@ -9,7 +9,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@speckle/objectloader": "^2.1.1",
+    "@speckle/objectloader": "^2.3.0",
     "aws-sdk": "^2.981.0",
     "core-js": "^3.6.5",
     "debounce": "^1.2.1",

ui/src/components/StreamCard.vue

@@ -148,8 +148,8 @@
           </v-tooltip>
         </v-col>
       </v-row>
-      <transition name="expand">
-        <v-card-text v-if="hover && !$apollo.loading" class="mt-0 pt-0">
+      <transition-group name="expand">
+        <v-card-text v-if="hover && !$apollo.loading" key="commit-message-field" class="mt-0 pt-0">
           <transition name="fade">
             <v-text-field
               v-model="commitMessage"
@@ -164,12 +164,13 @@
         </v-card-text>
         <v-progress-linear
           v-if="(loadingSend || loadingReceive) && loadingStage"
+          key="progress-bar"
           height="14"
           indeterminate
         >
           <div class="text-caption">{{ loadingStage }}</div>
         </v-progress-linear>
-      </transition>
+      </transition-group>
     </v-card>
   </v-hover>
 </template>
@@ -398,7 +399,7 @@ export default {
         let batchesSent = 0
         for (const batch of batches) {
           let res = await this.sendBatch(batch)
-          if (res.status !== 201) throw `Upload request failed: ${res}`
+          if (res.status !== 201) throw `Upload request failed: ${res.status}`
           batchesSent++
           this.loadingStage = `uploading: ${Math.round((batchesSent / totBatches) * 100)}%`
         }
@@ -433,7 +434,7 @@ export default {
     },
     async sendBatch(batch) {
       let formData = new FormData()
-      formData.append(`batch-1`, new Blob([JSON.stringify(batch)], { type: 'application/json' }))
+      formData.append(`batch-1`, new Blob([batch], { type: 'application/json' }))
       let token = localStorage.getItem('SpeckleSketchup.AuthToken')
       let res = await fetch(`${localStorage.getItem('serverUrl')}/objects/${this.streamId}`, {
         method: 'POST',

ui/src/utils/serialization.js

@@ -170,21 +170,21 @@ export class BaseObjectSerializer {
   batchObjects(maxBatchSizeMb = 1) {
     const maxSize = maxBatchSizeMb * 1000 * 1000
     let batches = []
-    let batch = []
+    let batch = '['
     let batchSize = 0
     let objects = Object.values(this.objects)
     objects.forEach((obj) => {
       let objString = JSON.stringify(obj)
       if (batchSize + objString.length < maxSize) {
-        batch.push(obj)
+        batch += objString + ','
         batchSize += objString.length
       } else {
-        batches.push(batch)
-        batch = [obj]
+        batches.push(batch.slice(0, -1) + ']')
+        batch = '[' + objString + ','
         batchSize = objString.length
       }
     })
-    batches.push(batch)
+    batches.push(batch.slice(0, -1) + ']')
 
     return batches
   }