Issue #SB-812 fix: Changed share url for unlisted content

src/app/helpers/shareUrlHelper.js

@@ -1,13 +1,24 @@
 let publicUri = '/public/#!'
 
 module.exports = function (app) {
- app.all('/content/*', function (req, res) {
+ app.all('/content/:id', function (req, res) {
  let redirectUrl = publicUri + req.path
  res.redirect(redirectUrl)
  })
 
- app.all('/course/*', function (req, res) {
+ app.all('/course/:id', function (req, res) {
  let redirectUrl = publicUri + req.path
  res.redirect(redirectUrl)
  })
+
+ app.all('/unlisted/:hash', function (req, res) {
+ let hash = req.params.hash
+ let uri = Buffer.from(hash, 'base64').toString()
+ let redirectUrl = publicUri + '/' + uri + '/unlisted'
+ if (redirectUrl.indexOf('collection') > -1) {
+ redirectUrl = redirectUrl.replace('collection', 'content')
+ redirectUrl = redirectUrl + '/'
+ }
+ res.redirect(redirectUrl)
+ })
 }

src/app/private/scripts/services/workSpaceUtilsService.js

@@ -151,6 +151,19 @@ angular.module('playerApp')
  return this.baseUrl + type + '/' + identifier
  }
 
+ /**
+ * @method getBase64Url
+ * @desc generate the base url to play unlisted content for public users.
+ * @memberOf Services.getBase64Url
+ * @param {string} identifier - content or course identifier
+ * @param {string} type - content or course type
+ * @returns {string} base64url to share.
+ * @instance
+ */
+ this.getBase64Url = function (type, identifier) {
+ return btoa(type + '/' + identifier)
+ }
+
  /**
  * @method getUnlistedShareUrl
  * @desc generate the url to play unlisted content for other users.
@@ -161,11 +174,11 @@ angular.module('playerApp')
  */
  this.getUnlistedShareUrl = function (cData) {
  if (cData.contentType === 'Course') {
- return this.baseUrl + 'course' + '/' + cData.identifier + '/' + config.UNLISTED_CONTENT_TYPE
+ return this.baseUrl + 'unlisted' + '/' + this.getBase64Url('course', cData.identifier)
  } else if (cData.mimeType === 'application/vnd.ekstep.content-collection') {
- return this.baseUrl + 'content' + '/' + cData.identifier + '/' + config.UNLISTED_CONTENT_TYPE + '/'
+ return this.baseUrl + 'unlisted' + '/' + this.getBase64Url('collection', cData.identifier)
  } else {
- return this.baseUrl + 'content' + '/' + cData.identifier + '/' + config.UNLISTED_CONTENT_TYPE
+ return this.baseUrl + 'unlisted' + '/' + this.getBase64Url('content', cData.identifier)
  }
  }
 

src/app/public/scripts/routes/publicAppRoute.js

@@ -62,7 +62,7 @@ angular.module('loginApp')
  views: {
  mainView: {
  controller: function ($scope, $stateParams, $window, toasterService, $rootScope, $state) {
- if ($stateParams.status === 'Unlisted') {
+ if ($stateParams.status === 'Unlisted' || $stateParams.status === 'unlisted') {
  window.localStorage.setItem('redirectUrl', '/content/' + $stateParams.id + '/')
  $window.location.href = '/private/index'
  } else {
@@ -82,7 +82,7 @@ angular.module('loginApp')
  views: {
  mainView: {
  controller: function ($scope, $stateParams, $window, toasterService, $rootScope, $state) {
- if ($stateParams.status === 'Unlisted') {
+ if ($stateParams.status === 'Unlisted' || $stateParams.status === 'unlisted') {
  window.localStorage.setItem('redirectUrl', '/course/' + $stateParams.id + '/')
  $window.location.href = '/private/index'
  } else {
@@ -102,7 +102,7 @@ angular.module('loginApp')
  views: {
  mainView: {
  controller: function ($scope, $stateParams, $window, toasterService, $rootScope, $state) {
- if ($stateParams.status === 'Unlisted') {
+ if ($stateParams.status === 'Unlisted' || $stateParams.status === 'unlisted') {
  window.localStorage.setItem('redirectUrl', '/preview/collection/' + $stateParams.id + '/' + '/')
  $window.location.href = '/private/index'
  } else {