@widgetic/editor 3.10.36 → 3.10.40

package/package.json

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

package/src/core/embed/controller.js

@@ -272,14 +272,21 @@ export default class EmbedController {
   }
 
   _showBranding() {
+    // read branding value
+    let brandingValue = new URLSearchParams(window.location.search).get('branding')
+    // console.log("read brandingValue:", brandingValue);
+    if(!brandingValue) brandingValue = 'off'
+
+    // check if user is premium
     let isPremium = (this.user && this.user.premium) ? this.user.premium : false;
-    // console.log("_showBranding:", this.user, isPremium, window.location.search.indexOf('branding'));
-    if(isPremium) return;
     
-    // show branding only if the flag is on
-    if (window.location.search.indexOf('branding') >= 0) {
-      window.initBranding();
-    }
+    // establish branding
+    if(!isPremium) brandingValue = "on";
+    // console.log("final brandingValue:", this.user, isPremium, brandingValue);
+    
+    
+    // show branding if user is free or flag is on
+    if (brandingValue != "off") window.initBranding();
   }
 
   _onSkinSet(skin) {

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

@@ -1,14 +1,14 @@
 Service = require '../../../browser/model'
 
 # Instagram service config
-host = 'https://widgetic.com'
+host = 'https://widgetic.com' + '/wservices/instagram'
 INSTAGRAM_DEFAULTS = {
     client_id:      '542808610040105', #widgetic instagram basic display app id
     client_secret:  '0a88504381f577dbbef400d4232a4258',
-    redirect_uri:   host + '/services/instagram/auth_token',
+    redirect_uri:   host + '/auth_token',
     scope: 			'user_profile,user_media',
     response_type:	'code',
-    api_url: 		host + '/services/instagram/',
+    api_url: 		host,
     demo:           "IGQVJVNUw5cHB5cUFiZATFxVmgyeWtSVFJjTDYyRmNnWDZAJZA3llVXREa1BsS1EtVGJ2UEdlbHJNbDV1UUQ2YkVSZA3YwS1dPWXJzYXFGQzdZAMlhBLTBWWWNkTVNHTGNDLW10dkdhNW0wMDVqMkhZAWEhqbgZDZD",
     token_storage:  "redis",
     encodeToken:    false,

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

@@ -2,14 +2,14 @@ Service = require '../../../browser/model'
 Entry   = require '../../../browser/model/entry'
 
 # Instagram service config
-host = 'https://widgetic.com'
+host = 'https://widgetic.com' + '/wservices/instagram/'
 INSTAGRAM_DEFAULTS = {
     client_id:      '542808610040105', #widgetic instagram basic display app id
     client_secret:  '0a88504381f577dbbef400d4232a4258',
-    redirect_uri:   host + '/services/instagram/auth_token',
+    redirect_uri:   host + 'auth_token',
     scope: 			'user_profile,user_media',
     response_type:	'code',
-    api_url: 		host + '/services/instagram/',
+    api_url: 		host,
     demo:           "IGQVJVNUw5cHB5cUFiZATFxVmgyeWtSVFJjTDYyRmNnWDZAJZA3llVXREa1BsS1EtVGJ2UEdlbHJNbDV1UUQ2YkVSZA3YwS1dPWXJzYXFGQzdZAMlhBLTBWWWNkTVNHTGNDLW10dkdhNW0wMDVqMkhZAWEhqbgZDZD",
     token_storage:  "redis",
     encodeToken:    false,

package/src/editor/content/service/soundcloud.coffee

@@ -2,24 +2,26 @@ Service = require '../../../browser/model'
 Entry   = require '../../../browser/model/entry'
 
 # SoundCloud config
+widgetic_backend_url = 'https://widgetic.com/wservices/soundcloud/'
 SC = require('soundcloud')
 config = {
+	api_url: 'https://api.soundcloud.com'
 	# for '/connect' endpoint
 	client_id :  'aed0aa63baf747a83ad0b6b246acddca'
+	# client_secret: '3173e3098379153d42084aba06fe3ec4',
 	redirect_uri: 'https://widgetic.com/connect/soundcloud',
-	response_type: 'code',
-	state: 'encrypted_session_info',
+	tracks_url:   widgetic_backend_url + 'tracks/',
+	# response_type: 'code',
+
 	# for '/oauth2/token' endpoint
 	grant_type: 'refresh_token',
-	client_secret: '3173e3098379153d42084aba06fe3ec4',
-	# local options
-	api_url: 'https://api.soundcloud.com',
 }
 SC.initialize(config);
-# add local config options used in this class only
+
+# add local config options used in this file only
 SC.client_id = config.client_id
-SC.redirect_uri = config.redirect_uri
 SC.api_url = config.api_url
+SC.tracks_url = config.tracks_url
 try SC.auth_token = localStorage.getItem 'soundcloudAuthToken'
 try SC.userId = localStorage.getItem 'soundcloudUserId'
 
@@ -30,7 +32,7 @@ class SoundCloudService extends Service
 	
 	SCGet: (path) ->
 		url = "#{SC.api_url}" + path
-		# console.log("SCGet path:", path)
+		# console.log("SCGet path:", path, SC.auth_token)
 		$.ajax(url: url, type: 'GET', dataType: 'json', headers: {'Authorization': 'OAuth ' + SC.auth_token})
 
 	auth: (interactive) => 
@@ -43,8 +45,7 @@ class SoundCloudService extends Service
 		else @checkAuth()
 
 	showAuthPopup: ->
-		# console.log("SC showAuthPopup:", SC.userId)
-		# @SCGet("/connect?client_id=#{SC.client_id}&redirect_uri=#{SC.redirect_uri}&response_type=code")
+		# console.log("SC showAuthPopup:", SC)
 		SC.connect()
 			.then((response) =>
 				# console.log("SC did connect:", response);
@@ -145,13 +146,18 @@ class SoundCloudService extends Service
 		}
 
 	getURL: (entry, callback) ->
-		# console.log("getURL", entry.stream_url)
+		# old method
 		# callback "#{entry.stream_url}?client_id=#{SC.client_id}"
-		@SCGet("/tracks/#{entry.id}/streams")
-				.then((streams) => 
-					# console.log("fetchTrackStreams result:", streams);
-					callback streams.http_mp3_128_url
-				).catch (error) => 
-					console.log 'Fetch Track Streams error: ' + error
+
+		# new 2021 api track path through widgetic endpoint
+		callback "#{SC.tracks_url}?id=#{entry.id}&atoken=#{SC.auth_token}"
+		
+		# new 2021 api get method
+		# @SCGet("/tracks/#{entry.id}/streams")
+		# 		.done((streams) => 
+		# 			console.log("fetchTrackStreams result:", streams);
+		# 			# callback streams.http_mp3_128_url
+		# 		).fail (error) => 
+		# 			console.log 'Fetch Track Streams error: ' + error
 
 module.exports = SoundCloudService