@atlaskit/media-picker 61.0.1 → 62.0.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/media-picker
 
+## 62.0.0
+
+### Major Changes
+
+- [`ad13b4d0bc6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ad13b4d0bc6) - [MEX-1525] Remove userAuth from Media-Core & Media-client
+
+### Minor Changes
+
+- [`fe7a1aaddd6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fe7a1aaddd6) - Attach media environment to Media Picker UFO events
+- [`7dad7e0c299`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7dad7e0c299) - [MEX-1413] Removed user auth from media-picker
+
+### Patch Changes
+
+- [`a5d25a077bc`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a5d25a077bc) - removed duplicated module from Confluence's node_modules introduced with our components
+- [`e368c622418`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e368c622418) - Updated component names in UFO experiences
+- Updated dependencies
+
 ## 61.0.1
 
 ### Patch Changes

package/dist/cjs/service/uploadServiceImpl.js

@@ -25,18 +25,12 @@ var _constants = require("@atlaskit/media-client/constants");
 
 var _eventemitter = require("eventemitter2");
 
-var _sourceFile = require("../popup/domain/source-file");
-
 var _getPreviewFromImage = require("../util/getPreviewFromImage");
 
 var _types = require("../service/types");
 
 var _getPreviewFromBlob = require("../util/getPreviewFromBlob");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var UploadServiceImpl = /*#__PURE__*/function () {
   function UploadServiceImpl(tenantMediaClient, tenantUploadParams, shouldCopyFileToRecents) {
     var _this = this;
@@ -54,10 +48,6 @@ var UploadServiceImpl = /*#__PURE__*/function () {
               case 0:
                 mediaFile = cancellableFileUpload.mediaFile;
 
-                _this.copyFileToUsersCollection(fileId) // eslint-disable-next-line no-console
-                .catch(console.log); // We intentionally swallow these errors
-
-
                 _this.emit('file-converting', {
                   file: mediaFile
                 });
@@ -66,7 +56,7 @@ var UploadServiceImpl = /*#__PURE__*/function () {
                   _this.releaseCancellableFile(mediaFile);
                 };
 
-              case 4:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -105,18 +95,6 @@ var UploadServiceImpl = /*#__PURE__*/function () {
     this.shouldCopyFileToRecents = shouldCopyFileToRecents;
     this.emitter = new _eventemitter.EventEmitter2();
     this.cancellableFilesUploads = {};
-    var userAuthProvider = tenantMediaClient.config.userAuthProvider;
-
-    if (userAuthProvider) {
-      this.userMediaStore = new _mediaClient.MediaStore({
-        authProvider: userAuthProvider
-      }); // We need to use the userAuth to upload this file (recents)
-
-      this.userMediaClient = new _mediaClient.MediaClient({
-        userAuthProvider: userAuthProvider,
-        authProvider: userAuthProvider
-      });
-    }
   }
 
   (0, _createClass2.default)(UploadServiceImpl, [{
@@ -362,37 +340,6 @@ var UploadServiceImpl = /*#__PURE__*/function () {
     value: function releaseCancellableFile(mediaFile) {
       delete this.cancellableFilesUploads[mediaFile.id];
     }
-  }, {
-    key: "copyFileToUsersCollection",
-    value: // This method copies the file from the "tenant collection" to the "user collection" (recents).
-    // that means we need "tenant auth" as input and "user auth" as output
-    function copyFileToUsersCollection(sourceFileId) {
-      var shouldCopyFileToRecents = this.shouldCopyFileToRecents,
-          userMediaStore = this.userMediaStore,
-          tenantUploadParams = this.tenantUploadParams;
-
-      if (!shouldCopyFileToRecents || !userMediaStore) {
-        return Promise.resolve();
-      }
-
-      var sourceCollection = tenantUploadParams.collection;
-      var tenantAuthProvider = this.tenantMediaClient.config.authProvider;
-      return tenantAuthProvider({
-        collectionName: sourceCollection
-      }).then(function (auth) {
-        var body = {
-          sourceFile: {
-            id: sourceFileId,
-            collection: sourceCollection,
-            owner: _objectSpread({}, (0, _sourceFile.mapAuthToSourceFileOwner)(auth))
-          }
-        };
-        var params = {
-          collection: _constants.RECENTS_COLLECTION
-        };
-        return userMediaStore.copyFileWithToken(body, params);
-      });
-    }
   }]);
   return UploadServiceImpl;
 }();

package/dist/cjs/util/ufoExperiences.js

@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _ufo = require("@atlaskit/ufo");
 
+var _mediaClient = require("@atlaskit/media-client");
+
 var _version = require("../version.json");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -23,7 +25,7 @@ var initExperience = function initExperience(id, componentName) {
   if (!ufoExperience) {
     var inlineExperience = {
       platform: {
-        component: componentName
+        component: "media-picker-".concat(componentName)
       },
       type: _ufo.ExperienceTypes.Experience,
       performanceType: _ufo.ExperiencePerformanceTypes.InlineResult
@@ -40,8 +42,8 @@ var getExperience = function getExperience(id) {
   }
 };
 
-var startMediaUploadUfoExperience = function startMediaUploadUfoExperience(id, properties) {
-  initExperience(id, properties).start();
+var startMediaUploadUfoExperience = function startMediaUploadUfoExperience(id, componentName) {
+  initExperience(id, componentName).start();
 };
 
 exports.startMediaUploadUfoExperience = startMediaUploadUfoExperience;
@@ -53,7 +55,9 @@ var succeedMediaUploadUfoExperience = function succeedMediaUploadUfoExperience(i
     metadata: {
       fileAttributes: properties,
       packageName: _version.name,
-      packageVersion: _version.version
+      packageVersion: _version.version,
+      mediaEnvironment: (0, _mediaClient.getMediaEnvironment)(),
+      mediaRegion: (0, _mediaClient.getMediaRegion)()
     }
   });
 };
@@ -65,7 +69,9 @@ var failMediaUploadUfoExperience = function failMediaUploadUfoExperience(id, pro
 
   var refinedMetadata = _objectSpread(_objectSpread({}, properties), {}, {
     packageName: _version.name,
-    packageVersion: _version.version
+    packageVersion: _version.version,
+    mediaEnvironment: (0, _mediaClient.getMediaEnvironment)(),
+    mediaRegion: (0, _mediaClient.getMediaRegion)()
   });
 
   (_getExperience2 = getExperience(id)) === null || _getExperience2 === void 0 ? void 0 : _getExperience2.failure({

package/dist/cjs/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/media-picker",
-	"version": "61.0.1"
+	"version": "62.0.0"
 }

package/dist/es2019/service/uploadServiceImpl.js

@@ -1,9 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import uuidV4 from 'uuid/v4';
-import { MediaStore, UploadController, getMediaTypeFromMimeType, isMimeTypeSupportedByBrowser, MediaClient, globalMediaEventEmitter, RequestError } from '@atlaskit/media-client';
+import { UploadController, getMediaTypeFromMimeType, isMimeTypeSupportedByBrowser, globalMediaEventEmitter, RequestError } from '@atlaskit/media-client';
 import { RECENTS_COLLECTION } from '@atlaskit/media-client/constants';
 import { EventEmitter2 } from 'eventemitter2';
-import { mapAuthToSourceFileOwner } from '../popup/domain/source-file';
 import { getPreviewFromImage } from '../util/getPreviewFromImage';
 import { LocalFileSource } from '../service/types';
 import { getPreviewFromBlob } from '../util/getPreviewFromBlob';
@@ -17,9 +16,6 @@ export class UploadServiceImpl {
       const {
         mediaFile
       } = cancellableFileUpload;
-      this.copyFileToUsersCollection(fileId) // eslint-disable-next-line no-console
-      .catch(console.log); // We intentionally swallow these errors
-
       this.emit('file-converting', {
         file: mediaFile
       });
@@ -56,20 +52,6 @@ export class UploadServiceImpl {
     this.shouldCopyFileToRecents = shouldCopyFileToRecents;
     this.emitter = new EventEmitter2();
     this.cancellableFilesUploads = {};
-    const {
-      userAuthProvider
-    } = tenantMediaClient.config;
-
-    if (userAuthProvider) {
-      this.userMediaStore = new MediaStore({
-        authProvider: userAuthProvider
-      }); // We need to use the userAuth to upload this file (recents)
-
-      this.userMediaClient = new MediaClient({
-        userAuthProvider,
-        authProvider: userAuthProvider
-      });
-    }
   }
 
   setUploadParams(uploadParams) {
@@ -297,41 +279,4 @@ export class UploadServiceImpl {
     delete this.cancellableFilesUploads[mediaFile.id];
   }
 
-  // This method copies the file from the "tenant collection" to the "user collection" (recents).
-  // that means we need "tenant auth" as input and "user auth" as output
-  copyFileToUsersCollection(sourceFileId) {
-    const {
-      shouldCopyFileToRecents,
-      userMediaStore,
-      tenantUploadParams
-    } = this;
-
-    if (!shouldCopyFileToRecents || !userMediaStore) {
-      return Promise.resolve();
-    }
-
-    const {
-      collection: sourceCollection
-    } = tenantUploadParams;
-    const {
-      authProvider: tenantAuthProvider
-    } = this.tenantMediaClient.config;
-    return tenantAuthProvider({
-      collectionName: sourceCollection
-    }).then(auth => {
-      const body = {
-        sourceFile: {
-          id: sourceFileId,
-          collection: sourceCollection,
-          owner: { ...mapAuthToSourceFileOwner(auth)
-          }
-        }
-      };
-      const params = {
-        collection: RECENTS_COLLECTION
-      };
-      return userMediaStore.copyFileWithToken(body, params);
-    });
-  }
-
 }

package/dist/es2019/util/analytics.js

@@ -1,5 +1,6 @@
 import { isRequestError } from '@atlaskit/media-client';
-import { name as packageName, version as packageVersion } from '../version.json';
+import { name as packageName, version as packageVersion } from '../version.json'; // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
+
 export function getPackageAttributes(componentName) {
   return {
     packageName,

package/dist/es2019/util/ufoExperiences.js

@@ -1,4 +1,5 @@
 import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
+import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { name as packageName, version as packageVersion } from '../version.json';
 let ufoExperience;
 
@@ -6,7 +7,7 @@ const initExperience = (id, componentName) => {
   if (!ufoExperience) {
     const inlineExperience = {
       platform: {
-        component: componentName
+        component: `media-picker-${componentName}`
       },
       type: ExperienceTypes.Experience,
       performanceType: ExperiencePerformanceTypes.InlineResult
@@ -23,8 +24,8 @@ const getExperience = id => {
   }
 };
 
-export const startMediaUploadUfoExperience = (id, properties) => {
-  initExperience(id, properties).start();
+export const startMediaUploadUfoExperience = (id, componentName) => {
+  initExperience(id, componentName).start();
 };
 export const succeedMediaUploadUfoExperience = (id, properties) => {
   var _getExperience;
@@ -33,7 +34,9 @@ export const succeedMediaUploadUfoExperience = (id, properties) => {
     metadata: {
       fileAttributes: properties,
       packageName,
-      packageVersion
+      packageVersion,
+      mediaEnvironment: getMediaEnvironment(),
+      mediaRegion: getMediaRegion()
     }
   });
 };
@@ -42,7 +45,9 @@ export const failMediaUploadUfoExperience = (id, properties) => {
 
   const refinedMetadata = { ...properties,
     packageName,
-    packageVersion
+    packageVersion,
+    mediaEnvironment: getMediaEnvironment(),
+    mediaRegion: getMediaRegion()
   };
   (_getExperience2 = getExperience(id)) === null || _getExperience2 === void 0 ? void 0 : _getExperience2.failure({
     metadata: refinedMetadata

package/dist/es2019/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/media-picker",
-	"version": "61.0.1"
+	"version": "62.0.0"
 }

package/dist/esm/service/uploadServiceImpl.js

@@ -3,16 +3,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import uuidV4 from 'uuid/v4';
-import { MediaStore, UploadController, getMediaTypeFromMimeType, isMimeTypeSupportedByBrowser, MediaClient, globalMediaEventEmitter, RequestError } from '@atlaskit/media-client';
+import { UploadController, getMediaTypeFromMimeType, isMimeTypeSupportedByBrowser, globalMediaEventEmitter, RequestError } from '@atlaskit/media-client';
 import { RECENTS_COLLECTION } from '@atlaskit/media-client/constants';
 import { EventEmitter2 } from 'eventemitter2';
-import { mapAuthToSourceFileOwner } from '../popup/domain/source-file';
 import { getPreviewFromImage } from '../util/getPreviewFromImage';
 import { LocalFileSource } from '../service/types';
 import { getPreviewFromBlob } from '../util/getPreviewFromBlob';
@@ -35,10 +29,6 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
               case 0:
                 mediaFile = cancellableFileUpload.mediaFile;
 
-                _this.copyFileToUsersCollection(fileId) // eslint-disable-next-line no-console
-                .catch(console.log); // We intentionally swallow these errors
-
-
                 _this.emit('file-converting', {
                   file: mediaFile
                 });
@@ -47,7 +37,7 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
                   _this.releaseCancellableFile(mediaFile);
                 };
 
-              case 4:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -88,18 +78,6 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
     this.shouldCopyFileToRecents = shouldCopyFileToRecents;
     this.emitter = new EventEmitter2();
     this.cancellableFilesUploads = {};
-    var userAuthProvider = tenantMediaClient.config.userAuthProvider;
-
-    if (userAuthProvider) {
-      this.userMediaStore = new MediaStore({
-        authProvider: userAuthProvider
-      }); // We need to use the userAuth to upload this file (recents)
-
-      this.userMediaClient = new MediaClient({
-        userAuthProvider: userAuthProvider,
-        authProvider: userAuthProvider
-      });
-    }
   }
 
   _createClass(UploadServiceImpl, [{
@@ -344,37 +322,6 @@ export var UploadServiceImpl = /*#__PURE__*/function () {
     value: function releaseCancellableFile(mediaFile) {
       delete this.cancellableFilesUploads[mediaFile.id];
     }
-  }, {
-    key: "copyFileToUsersCollection",
-    value: // This method copies the file from the "tenant collection" to the "user collection" (recents).
-    // that means we need "tenant auth" as input and "user auth" as output
-    function copyFileToUsersCollection(sourceFileId) {
-      var shouldCopyFileToRecents = this.shouldCopyFileToRecents,
-          userMediaStore = this.userMediaStore,
-          tenantUploadParams = this.tenantUploadParams;
-
-      if (!shouldCopyFileToRecents || !userMediaStore) {
-        return Promise.resolve();
-      }
-
-      var sourceCollection = tenantUploadParams.collection;
-      var tenantAuthProvider = this.tenantMediaClient.config.authProvider;
-      return tenantAuthProvider({
-        collectionName: sourceCollection
-      }).then(function (auth) {
-        var body = {
-          sourceFile: {
-            id: sourceFileId,
-            collection: sourceCollection,
-            owner: _objectSpread({}, mapAuthToSourceFileOwner(auth))
-          }
-        };
-        var params = {
-          collection: RECENTS_COLLECTION
-        };
-        return userMediaStore.copyFileWithToken(body, params);
-      });
-    }
   }]);
 
   return UploadServiceImpl;

package/dist/esm/util/analytics.js

@@ -1,5 +1,6 @@
 import { isRequestError } from '@atlaskit/media-client';
-import { name as packageName, version as packageVersion } from '../version.json';
+import { name as packageName, version as packageVersion } from '../version.json'; // Component name will be prefixed with "media-picker-" in logs. Check ufoExperiences in utils files
+
 export function getPackageAttributes(componentName) {
   return {
     packageName: packageName,

package/dist/esm/util/ufoExperiences.js

@@ -5,6 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
+import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { name as packageName, version as packageVersion } from '../version.json';
 var ufoExperience;
 
@@ -12,7 +13,7 @@ var initExperience = function initExperience(id, componentName) {
   if (!ufoExperience) {
     var inlineExperience = {
       platform: {
-        component: componentName
+        component: "media-picker-".concat(componentName)
       },
       type: ExperienceTypes.Experience,
       performanceType: ExperiencePerformanceTypes.InlineResult
@@ -29,8 +30,8 @@ var getExperience = function getExperience(id) {
   }
 };
 
-export var startMediaUploadUfoExperience = function startMediaUploadUfoExperience(id, properties) {
-  initExperience(id, properties).start();
+export var startMediaUploadUfoExperience = function startMediaUploadUfoExperience(id, componentName) {
+  initExperience(id, componentName).start();
 };
 export var succeedMediaUploadUfoExperience = function succeedMediaUploadUfoExperience(id, properties) {
   var _getExperience;
@@ -39,7 +40,9 @@ export var succeedMediaUploadUfoExperience = function succeedMediaUploadUfoExper
     metadata: {
       fileAttributes: properties,
       packageName: packageName,
-      packageVersion: packageVersion
+      packageVersion: packageVersion,
+      mediaEnvironment: getMediaEnvironment(),
+      mediaRegion: getMediaRegion()
     }
   });
 };
@@ -48,7 +51,9 @@ export var failMediaUploadUfoExperience = function failMediaUploadUfoExperience(
 
   var refinedMetadata = _objectSpread(_objectSpread({}, properties), {}, {
     packageName: packageName,
-    packageVersion: packageVersion
+    packageVersion: packageVersion,
+    mediaEnvironment: getMediaEnvironment(),
+    mediaRegion: getMediaRegion()
   });
 
   (_getExperience2 = getExperience(id)) === null || _getExperience2 === void 0 ? void 0 : _getExperience2.failure({

package/dist/esm/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/media-picker",
-	"version": "61.0.1"
+	"version": "62.0.0"
 }

package/dist/types/popup/domain/index.d.ts

@@ -1,6 +1,3 @@
-export type { AuthHeaders } from './auth';
-export type { SourceFile, SourceFileOwner, ClientBasedSourceFileOwner, AsapBasedSourceFileOwner, } from './source-file';
-export declare type ServiceName = 'recent_files' | 'google' | 'dropbox' | 'upload' | 'giphy' | string;
 export interface ServiceFile {
     readonly mimeType: string;
     readonly id: string;
@@ -12,6 +9,6 @@ export interface ServiceFile {
     readonly createdAt?: number;
 }
 export interface SelectedItem extends ServiceFile {
-    readonly serviceName: ServiceName;
+    readonly serviceName: string;
     readonly accountId?: string;
 }

package/dist/types/service/uploadServiceImpl.d.ts

@@ -12,7 +12,6 @@ export declare class UploadServiceImpl implements UploadService {
     private readonly tenantMediaClient;
     private tenantUploadParams;
     private readonly shouldCopyFileToRecents;
-    private readonly userMediaStore?;
     private readonly userMediaClient?;
     private readonly emitter;
     private cancellableFilesUploads;
@@ -31,5 +30,4 @@ export declare class UploadServiceImpl implements UploadService {
     private releaseCancellableFile;
     private readonly onFileSuccess;
     private readonly onFileError;
-    private copyFileToUsersCollection;
 }

package/dist/types/util/ufoExperiences.d.ts

@@ -8,6 +8,6 @@ export declare type UFOFailedEventPayload = {
     uploadDurationMsec: number;
     request?: RequestMetadata;
 } & WithFileAttributes;
-export declare const startMediaUploadUfoExperience: (id: string, properties: ComponentName) => void;
+export declare const startMediaUploadUfoExperience: (id: string, componentName: ComponentName) => void;
 export declare const succeedMediaUploadUfoExperience: (id: string, properties: FileAttributes) => void;
 export declare const failMediaUploadUfoExperience: (id: string, properties?: UFOFailedEventPayload | undefined) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-picker",
-  "version": "61.0.1",
+  "version": "62.0.0",
   "description": "Library for handling file uploads",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -27,22 +27,21 @@
   },
   "dependencies": {
     "@atlaskit/analytics-next": "^8.2.0",
-    "@atlaskit/media-client": "^15.1.0",
-    "@atlaskit/media-common": "^2.12.0",
-    "@atlaskit/media-ui": "^21.1.0",
+    "@atlaskit/media-client": "^16.0.0",
+    "@atlaskit/media-common": "^2.13.0",
+    "@atlaskit/media-ui": "^22.0.0",
     "@atlaskit/ufo": "^0.1.0",
     "@babel/runtime": "^7.0.0",
     "eventemitter2": "^4.1.0",
     "exenv": "^1.2.2",
     "flat-files": "^1.0.6",
-    "jwt-decode": "^2.2.0",
     "perf-marks": "^1.5.0",
     "rxjs": "^5.5.0",
     "uuid": "^3.1.0",
     "uuid-validate": "^0.0.3"
   },
   "peerDependencies": {
-    "@atlaskit/media-core": "^32.3.1",
+    "@atlaskit/media-core": "^33.0.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-intl-next": "npm:react-intl@^5.18.1",
@@ -54,17 +53,15 @@
     "@atlaskit/button": "^16.3.0",
     "@atlaskit/docs": "*",
     "@atlaskit/dropdown-menu": "^11.1.0",
-    "@atlaskit/media-card": "^73.5.0",
-    "@atlaskit/media-core": "^32.3.0",
-    "@atlaskit/media-test-helpers": "^29.4.0",
+    "@atlaskit/media-card": "^73.6.0",
+    "@atlaskit/media-core": "^33.0.0",
+    "@atlaskit/media-test-helpers": "^30.0.0",
     "@atlaskit/spinner": "^15.0.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/toggle": "^12.4.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@atlassian/ufo": "^0.1.12",
     "@types/enzyme": "^3.1.15",
-    "@types/eventemitter2": "^4.1.0",
-    "@types/jwt-decode": "^2.2.1",
     "@types/react": "^16.8.0",
     "enzyme": "^3.10.0",
     "fetch-mock": "^8.0.0",

package/dist/cjs/components/popup-auth.js

@@ -1,97 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createPopupUserAuthProvider = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _jwtDecode = _interopRequireDefault(require("jwt-decode"));
-
-var _mediaCore = require("@atlaskit/media-core");
-
-var getAuthFromEdgeData = function getAuthFromEdgeData(response) {
-  return {
-    clientId: response.data.clientId,
-    token: response.data.token,
-    baseUrl: response.data.baseUrl
-  };
-};
-
-var getClientIdFromAuth = function getClientIdFromAuth(auth) {
-  if ((0, _mediaCore.isClientBasedAuth)(auth)) {
-    return auth.clientId;
-  }
-
-  var tokenData = (0, _jwtDecode.default)(auth.token);
-  return tokenData.clientId;
-};
-
-var createPopupUserAuthProvider = function createPopupUserAuthProvider(stargate, mediaClientConfig) {
-  var tokenData;
-  return /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(context) {
-      var userAuthProvider, authProvider, clientId;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              userAuthProvider = mediaClientConfig.userAuthProvider;
-
-              if (!userAuthProvider) {
-                _context.next = 3;
-                break;
-              }
-
-              return _context.abrupt("return", userAuthProvider(context));
-
-            case 3:
-              _context.prev = 3;
-
-              if (!(!tokenData || stargate.isTokenExpired(tokenData))) {
-                _context.next = 14;
-                break;
-              }
-
-              authProvider = mediaClientConfig.authProvider;
-              _context.t0 = getClientIdFromAuth;
-              _context.next = 9;
-              return authProvider(context);
-
-            case 9:
-              _context.t1 = _context.sent;
-              clientId = (0, _context.t0)(_context.t1);
-              _context.next = 13;
-              return stargate.fetchToken(clientId);
-
-            case 13:
-              tokenData = _context.sent;
-
-            case 14:
-              return _context.abrupt("return", getAuthFromEdgeData(tokenData));
-
-            case 17:
-              _context.prev = 17;
-              _context.t2 = _context["catch"](3);
-              throw new Error('Popup media picker Stargate call failed. If you were not intending to use Stargate you should provide userAuthProvider in the context');
-
-            case 20:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[3, 17]]);
-    }));
-
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-};
-
-exports.createPopupUserAuthProvider = createPopupUserAuthProvider;

package/dist/cjs/popup/domain/auth.js

@@ -1,37 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mapAuthToAuthHeaders = mapAuthToAuthHeaders;
-exports.mapAuthToQueryParameters = mapAuthToQueryParameters;
-
-var _mediaCore = require("@atlaskit/media-core");
-
-function mapAuthToAuthHeaders(auth) {
-  if ((0, _mediaCore.isClientBasedAuth)(auth)) {
-    return {
-      'X-Client-Id': auth.clientId,
-      Authorization: "Bearer ".concat(auth.token)
-    };
-  } else {
-    return {
-      'X-Issuer': auth.asapIssuer,
-      Authorization: "Bearer ".concat(auth.token)
-    };
-  }
-}
-
-function mapAuthToQueryParameters(auth) {
-  if ((0, _mediaCore.isClientBasedAuth)(auth)) {
-    return {
-      client: auth.clientId,
-      token: auth.token
-    };
-  } else {
-    return {
-      issuer: auth.asapIssuer,
-      token: auth.token
-    };
-  }
-}

package/dist/cjs/popup/domain/source-file.js

@@ -1,20 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mapAuthToSourceFileOwner = mapAuthToSourceFileOwner;
-
-var _mediaCore = require("@atlaskit/media-core");
-
-function mapAuthToSourceFileOwner(auth) {
-  if ((0, _mediaCore.isClientBasedAuth)(auth)) {
-    return {
-      id: auth.clientId,
-      token: auth.token,
-      baseUrl: auth.baseUrl
-    };
-  } else {
-    return auth;
-  }
-}

package/dist/es2019/components/popup-auth.js

@@ -1,44 +0,0 @@
-import jwtDecode from 'jwt-decode';
-import { isClientBasedAuth } from '@atlaskit/media-core';
-
-const getAuthFromEdgeData = response => ({
-  clientId: response.data.clientId,
-  token: response.data.token,
-  baseUrl: response.data.baseUrl
-});
-
-const getClientIdFromAuth = auth => {
-  if (isClientBasedAuth(auth)) {
-    return auth.clientId;
-  }
-
-  const tokenData = jwtDecode(auth.token);
-  return tokenData.clientId;
-};
-
-export const createPopupUserAuthProvider = (stargate, mediaClientConfig) => {
-  let tokenData;
-  return async context => {
-    const {
-      userAuthProvider
-    } = mediaClientConfig;
-
-    if (userAuthProvider) {
-      return userAuthProvider(context);
-    }
-
-    try {
-      if (!tokenData || stargate.isTokenExpired(tokenData)) {
-        const {
-          authProvider
-        } = mediaClientConfig;
-        const clientId = getClientIdFromAuth(await authProvider(context));
-        tokenData = await stargate.fetchToken(clientId);
-      }
-
-      return getAuthFromEdgeData(tokenData);
-    } catch (e) {
-      throw new Error('Popup media picker Stargate call failed. If you were not intending to use Stargate you should provide userAuthProvider in the context');
-    }
-  };
-};

package/dist/es2019/popup/domain/auth.js

@@ -1,27 +0,0 @@
-import { isClientBasedAuth } from '@atlaskit/media-core';
-export function mapAuthToAuthHeaders(auth) {
-  if (isClientBasedAuth(auth)) {
-    return {
-      'X-Client-Id': auth.clientId,
-      Authorization: `Bearer ${auth.token}`
-    };
-  } else {
-    return {
-      'X-Issuer': auth.asapIssuer,
-      Authorization: `Bearer ${auth.token}`
-    };
-  }
-}
-export function mapAuthToQueryParameters(auth) {
-  if (isClientBasedAuth(auth)) {
-    return {
-      client: auth.clientId,
-      token: auth.token
-    };
-  } else {
-    return {
-      issuer: auth.asapIssuer,
-      token: auth.token
-    };
-  }
-}

package/dist/es2019/popup/domain/source-file.js

@@ -1,12 +0,0 @@
-import { isClientBasedAuth } from '@atlaskit/media-core';
-export function mapAuthToSourceFileOwner(auth) {
-  if (isClientBasedAuth(auth)) {
-    return {
-      id: auth.clientId,
-      token: auth.token,
-      baseUrl: auth.baseUrl
-    };
-  } else {
-    return auth;
-  }
-}

package/dist/esm/components/popup-auth.js

@@ -1,83 +0,0 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import jwtDecode from 'jwt-decode';
-import { isClientBasedAuth } from '@atlaskit/media-core';
-
-var getAuthFromEdgeData = function getAuthFromEdgeData(response) {
-  return {
-    clientId: response.data.clientId,
-    token: response.data.token,
-    baseUrl: response.data.baseUrl
-  };
-};
-
-var getClientIdFromAuth = function getClientIdFromAuth(auth) {
-  if (isClientBasedAuth(auth)) {
-    return auth.clientId;
-  }
-
-  var tokenData = jwtDecode(auth.token);
-  return tokenData.clientId;
-};
-
-export var createPopupUserAuthProvider = function createPopupUserAuthProvider(stargate, mediaClientConfig) {
-  var tokenData;
-  return /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(context) {
-      var userAuthProvider, authProvider, clientId;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              userAuthProvider = mediaClientConfig.userAuthProvider;
-
-              if (!userAuthProvider) {
-                _context.next = 3;
-                break;
-              }
-
-              return _context.abrupt("return", userAuthProvider(context));
-
-            case 3:
-              _context.prev = 3;
-
-              if (!(!tokenData || stargate.isTokenExpired(tokenData))) {
-                _context.next = 14;
-                break;
-              }
-
-              authProvider = mediaClientConfig.authProvider;
-              _context.t0 = getClientIdFromAuth;
-              _context.next = 9;
-              return authProvider(context);
-
-            case 9:
-              _context.t1 = _context.sent;
-              clientId = (0, _context.t0)(_context.t1);
-              _context.next = 13;
-              return stargate.fetchToken(clientId);
-
-            case 13:
-              tokenData = _context.sent;
-
-            case 14:
-              return _context.abrupt("return", getAuthFromEdgeData(tokenData));
-
-            case 17:
-              _context.prev = 17;
-              _context.t2 = _context["catch"](3);
-              throw new Error('Popup media picker Stargate call failed. If you were not intending to use Stargate you should provide userAuthProvider in the context');
-
-            case 20:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[3, 17]]);
-    }));
-
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-};

package/dist/esm/popup/domain/auth.js

@@ -1,27 +0,0 @@
-import { isClientBasedAuth } from '@atlaskit/media-core';
-export function mapAuthToAuthHeaders(auth) {
-  if (isClientBasedAuth(auth)) {
-    return {
-      'X-Client-Id': auth.clientId,
-      Authorization: "Bearer ".concat(auth.token)
-    };
-  } else {
-    return {
-      'X-Issuer': auth.asapIssuer,
-      Authorization: "Bearer ".concat(auth.token)
-    };
-  }
-}
-export function mapAuthToQueryParameters(auth) {
-  if (isClientBasedAuth(auth)) {
-    return {
-      client: auth.clientId,
-      token: auth.token
-    };
-  } else {
-    return {
-      issuer: auth.asapIssuer,
-      token: auth.token
-    };
-  }
-}

package/dist/esm/popup/domain/source-file.js

@@ -1,12 +0,0 @@
-import { isClientBasedAuth } from '@atlaskit/media-core';
-export function mapAuthToSourceFileOwner(auth) {
-  if (isClientBasedAuth(auth)) {
-    return {
-      id: auth.clientId,
-      token: auth.token,
-      baseUrl: auth.baseUrl
-    };
-  } else {
-    return auth;
-  }
-}

package/dist/types/components/popup-auth.d.ts

@@ -1,3 +0,0 @@
-import { StargateClient } from '@atlaskit/media-client';
-import { AuthProvider, MediaClientConfig } from '@atlaskit/media-core';
-export declare const createPopupUserAuthProvider: (stargate: StargateClient, mediaClientConfig: MediaClientConfig) => AuthProvider;

package/dist/types/popup/domain/auth.d.ts

@@ -1,21 +0,0 @@
-import { Auth } from '@atlaskit/media-core';
-export interface ClientBasedAuthHeaders {
-    readonly 'X-Client-Id': string;
-    readonly Authorization: string;
-}
-export interface AsapBasedAuthHeaders {
-    readonly 'X-Issuer': string;
-    readonly Authorization: string;
-}
-export declare type AuthHeaders = ClientBasedAuthHeaders | AsapBasedAuthHeaders;
-export interface ClientBasedQueryParameters {
-    readonly client: string;
-    readonly token: string;
-}
-export interface AsapBasedQueryParameters {
-    readonly issuer: string;
-    readonly token: string;
-}
-export declare type AuthQueryParameters = ClientBasedQueryParameters | AsapBasedQueryParameters;
-export declare function mapAuthToAuthHeaders(auth: Auth): AuthHeaders;
-export declare function mapAuthToQueryParameters(auth: Auth): AuthQueryParameters;

package/dist/types/popup/domain/source-file.d.ts

@@ -1,14 +0,0 @@
-import { Auth } from '@atlaskit/media-core';
-export type { SourceFile } from '@atlaskit/media-client';
-export declare type ClientBasedSourceFileOwner = {
-    readonly id: string;
-    readonly token: string;
-    readonly baseUrl: string;
-};
-export declare type AsapBasedSourceFileOwner = {
-    readonly asapIssuer: string;
-    readonly token: string;
-    readonly baseUrl: string;
-};
-export declare type SourceFileOwner = ClientBasedSourceFileOwner | AsapBasedSourceFileOwner;
-export declare function mapAuthToSourceFileOwner(auth: Auth): SourceFileOwner;