@atlaskit/media-client 37.1.0 → 37.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/media-client
 
+## 37.1.1
+
+### Patch Changes
+
+- [`8bac4be486285`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8bac4be486285) -
+  Adds a client-side validation guard in media-client's resolveAuth that rejects an auth resolving
+  to neither a valid clientId nor a valid asapIssuer, behind the platform_media_validate_client_id
+
 ## 37.1.0
 
 ### Minor Changes

package/dist/cjs/client/media-store/resolveAuth.js

@@ -87,8 +87,14 @@ var resolveAuth = exports.resolveAuth = /*#__PURE__*/function () {
           }
           throw new _error.MediaStoreError('emptyAuth');
         case 6:
-          return _context.abrupt("return", auth);
+          if (!('clientId' in auth && !auth.clientId && (0, _platformFeatureFlags.fg)('platform_media_validate_client_id'))) {
+            _context.next = 7;
+            break;
+          }
+          throw new _error.MediaStoreError('emptyClientId');
         case 7:
+          return _context.abrupt("return", auth);
+        case 8:
         case "end":
           return _context.stop();
       }

package/dist/es2019/client/media-store/resolveAuth.js

@@ -58,6 +58,14 @@ export const resolveAuth = async (authProvider, authContext, authProviderTimeout
     throw new MediaStoreError('emptyAuth');
   }
 
+  /*
+  Only client-based auth carries a clientId. Fail fast when it is present but empty, instead of
+  letting the request reach dt-auth and get rejected with `Client id "" is invalid`.
+   */
+  if ('clientId' in auth && !auth.clientId && fg('platform_media_validate_client_id')) {
+    throw new MediaStoreError('emptyClientId');
+  }
+
   /*
      We added a token expiration check here in the past, and then we had to revert due to edge cases in the client that we can't control.
      Token expiration check in the frontend is a bad idea. Don't do it!

package/dist/esm/client/media-store/resolveAuth.js

@@ -80,8 +80,14 @@ export var resolveAuth = /*#__PURE__*/function () {
           }
           throw new MediaStoreError('emptyAuth');
         case 6:
-          return _context.abrupt("return", auth);
+          if (!('clientId' in auth && !auth.clientId && fg('platform_media_validate_client_id'))) {
+            _context.next = 7;
+            break;
+          }
+          throw new MediaStoreError('emptyClientId');
         case 7:
+          return _context.abrupt("return", auth);
+        case 8:
         case "end":
           return _context.stop();
       }

package/dist/types/client/media-store/error.d.ts

@@ -1,5 +1,5 @@
 import { BaseMediaClientError } from '../../models/errors';
-export type MediaStoreErrorReason = 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut';
+export type MediaStoreErrorReason = 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'emptyClientId' | 'authProviderTimedOut';
 export type MediaStoreErrorAttributes = {
     readonly reason: MediaStoreErrorReason;
     readonly innerError?: Error;

package/dist/types/models/errors/types.d.ts

@@ -2,7 +2,7 @@ import { type MediaTraceContext } from '@atlaskit/media-common';
 export interface SerializableObject {
     [key: string]: string | number | boolean | null | undefined | SerializableObject;
 }
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'serverUnprocessableEntity' | 'serverEntityLocked' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'serverUnprocessableEntity' | 'serverEntityLocked' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'emptyClientId' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export type MediaClientErrorMetadata = SerializableObject & {
     traceContext?: MediaTraceContext;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "37.1.0",
+	"version": "37.1.1",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -85,6 +85,9 @@
 		"platform_media_auth_provider_analytics": {
 			"type": "boolean"
 		},
+		"platform_media_validate_client_id": {
+			"type": "boolean"
+		},
 		"confluence_watermark_admin_ui": {
 			"type": "boolean"
 		},