@widgetic/editor 3.10.41 → 3.10.43

package/package.json

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

package/src/browser/controller/instagram.coffee

@@ -51,12 +51,22 @@ class InstagramBrowser extends Controller
 		# use the first one as the connected account
 		# (there should be only one, but just in case)
 		@authenticated = !!@content.length
+		console.log("Editor Instagram Browser @authenticated:", @authenticated, @content[0]);
 		@el.attr {@authenticated}
 		if @authenticated
 			@connectedAccount = @content[0]
 			# the content metadata stores the SHA256 hash of the user's Instagram token
 			@service.getUser(@connectedAccount.token)
-				.then((user) => this._updateLogoutIntent(user))
+				.then((user) =>
+					console.log("Editor Instagram Browser CT getUser result:", user)
+					if(user.error) 
+						# 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
@@ -69,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
@@ -88,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
 
@@ -109,6 +121,7 @@ class InstagramBrowser extends Controller
 		@tab.count @content.length
 
 	_updateLogoutIntent: (user) ->
+		# console.log("update logout intent:", user)
 		@logoutIntent.remove()
 		@logoutIntent = $ LogoutIntent user
 		@el.append @logoutIntent

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

@@ -1,7 +1,7 @@
 Service = require '../../../browser/model'
 
 # Instagram service config
-host = 'https://widgetic.com' + '/services/instagram'
+host = 'https://widgetic.com' + '/services/instagram' #live server path
 INSTAGRAM_DEFAULTS = {
     client_id:      '542808610040105', #widgetic instagram basic display app id
     client_secret:  '0a88504381f577dbbef400d4232a4258',
@@ -18,9 +18,15 @@ INSTAGRAM_DEFAULTS = {
 }
 api = window.INSTAGRAM_SERVICE_CONFIG || INSTAGRAM_DEFAULTS
 # console.log("EDITOR Instagram API:", api);
+
+# 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);
+
+# 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}"
 
+# INSTAGRAM SERVICE CLASS
 class InstagramService extends Service
 	@browser: 'browser/controller/instagram'
 
@@ -33,20 +39,22 @@ class InstagramService extends Service
 		return api.token
 
 	getUser: (token) ->
-		url = "#{api.api_url}me"
+		# 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 getUser result:", result)
+					console.log("Editor Instagram Service getUser result:", result)
 					@user = result
 					@trigger 'auth', @authenticated = true
 				.catch => 
-					# console.log("Editor getUser 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