@widgetic/editor 3.10.42 → 3.10.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widgetic/editor",
-  "version": "3.10.42",
+  "version": "3.10.44",
   "scripts": {
     "start": "webpack --config webpack.config.js --watch --progress",
     "build": "webpack --config webpack.config.js",

package/src/browser/controller/instagram.coffee

@@ -58,12 +58,15 @@ class InstagramBrowser extends Controller
 			# the content metadata stores the SHA256 hash of the user's Instagram token
 			@service.getUser(@connectedAccount.token)
 				.then((user) =>
+					console.log("Editor Instagram Browser CT getUser result:", user)
 					if(user.error) 
-						# console.log("editor browser get inst user:", user.error)
-						@onAuth(false);
+						# console.log("Editor Browser get inst user result:", user)
+						# @onAuth(false);
+						this._updateLogoutIntent(@connectedAccount)
 					else 
 						this._updateLogoutIntent(user)
 				)
+				.catch((err) => console.log("Editor Browser getUser err:", err))
 
 	active: ->
 		Activateable.active.apply @, arguments
@@ -76,12 +79,13 @@ class InstagramBrowser extends Controller
 		Activateable.deactivate.apply @, arguments
 
 	auth: (e) ->
+		console.log("Editor Instagram Browser auth handler:", e, @authenticated);
 		return if @authenticated
 		@service.auth( e?.type is 'click')
 		true
 
 	onAuth: (@authenticated) =>
-		console.log("Editor browser onAuth:", @authenticated)
+		console.log("Editor Instagram Browser onAuth:", @authenticated, @service.user)
 		@el.attr {@authenticated}
 		@$trigger "editor:browser:auth", service: @Service.name, @authenticated
 		return unless @authenticated
@@ -95,6 +99,7 @@ class InstagramBrowser extends Controller
 		item.type = 'user_id'
 		item.id = @service.user.id
 		item.url = 'Instagram User: @' + @service.user.username
+		item.username = @service.user.username
 		@connectedAccount = item
 		@trigger 'add', item
 
@@ -116,7 +121,7 @@ class InstagramBrowser extends Controller
 		@tab.count @content.length
 
 	_updateLogoutIntent: (user) ->
-		console.log("update logout intent:", user)
+		# console.log("update logout intent:", user)
 		@logoutIntent.remove()
 		@logoutIntent = $ LogoutIntent user
 		@el.append @logoutIntent

package/src/core/services/uploads.js

@@ -29,14 +29,19 @@ const parseType = type =>
 export default class UploadService extends EventsMixin(Service) {
   constructor(user, token) {
     super();
+
     this.user = user.id;
-    this.maxFilesize = user.premium ? 250 : 100;
     this.token = token;
 
-    this.files = [];
     this.refreshed = {};
 
-    this.quota = 1000 * 1000 * 1000;
+    this.files = [];
+    // max file size in MB
+    this.maxFilesize = user.premium ? 250 : 25; // MB limit / file for premium / free
+
+    // max quota in bytes
+    this.quota = 250 * 1000 * 1000; // 250 MB total quota for free users
+    // used quota in bytes
     this.used = 0;
 
     this.events = ['update', 'complete'];
@@ -88,6 +93,8 @@ export default class UploadService extends EventsMixin(Service) {
     const response = JSON.parse(uploadFile.xhr.response);
 
     const id = response.files.data[0].id;
+
+    // read quota from response
     this.quota = response.quota.max;
     this.used = response.quota.used;
 
@@ -157,6 +164,8 @@ export default class UploadService extends EventsMixin(Service) {
       })
       .then(response => {
         this.refreshed[type] = true;
+
+        // read quota from response
         this.quota = response.quota.max;
         this.used = response.quota.used;
 

package/src/editor/content/service/instagram-social.coffee

@@ -21,7 +21,7 @@ api = window.INSTAGRAM_SERVICE_CONFIG || INSTAGRAM_DEFAULTS
 
 # read current logged user's instagram auth token
 try api.token = localStorage.getItem 'instagramAuthToken'
-console.log("EDITOR Instagram Service current user's token:", api.token);
+console.log("Editor Instagram Service current user's token:", api.token);
 
 # define auth url that will open in authorize popup
 auth_url =  "https://api.instagram.com/oauth/authorize/?client_id=#{api.client_id}&redirect_uri=#{api.redirect_uri}&response_type=#{api.response_type}&scope=#{api.scope}"
@@ -39,21 +39,22 @@ class InstagramService extends Service
 		return api.token
 
 	getUser: (token) ->
-		console.log("Editor Instagram Service getUser:", token, api.api_url);
+		# console.log("Editor Instagram Service getUser:", token, api.api_url);
 		url = "#{api.api_url}/me"
 		$.ajax(url: url, type: 'GET', dataType: 'json', headers: {'X-Token': token})
 
 	_auth: (interactive=true) ->
-		# console.log("Editor ISTG service _auth method:", interactive, api);
+		console.log("Editor Instagram Service _auth method:", interactive, api.token);
 		# if authenticated get user info to show it in the browser
 		if api.token?
+			# console.log("Editor Instagram Service _auth method:", interactive, api.token);
 			@getUser(api.token)
 				.then (result) =>
-					console.log("Editor get User result:", result)
+					console.log("Editor Instagram Service getUser result:", result)
 					@user = result
 					@trigger 'auth', @authenticated = true
 				.catch => 
-					console.log("Editor get User error:", error)
+					console.log("Editor Instagram Service getUser error:", error)
 					@deauth()
 		# console.log("Editor INSTG service _auth method:", interactive, api);
 		# if not authenticated open popup