Discord username can now be added to one's Profile, allowing to claim…

… a role on GDevelop's server (#5962) * If you have a Gold or Startup subscription, head down to your profile, to claim access to a premium channel on Discord, where you can discuss together and ask for support.
4ian · Nov 27, 2023 · 38651ed · 38651ed
1 parent d34f1a6
commit 38651ed
Show file tree

Hide file tree

Showing 31 changed files with 560 additions and 146 deletions.
diff --git a/newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetPackInformationPage.js b/newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetPackInformationPage.js
@@ -41,6 +41,7 @@ import { formatProductPrice } from '../ProductPriceTag';
 import AuthenticatedUserContext from '../../Profile/AuthenticatedUserContext';
 import { PrivateAssetPackTile, PromoBundleAssetPackCard } from '../ShopTiles';
 import { AssetStoreContext } from '../AssetStoreContext';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 const cellSpacing = 8;
 
@@ -290,7 +291,10 @@ const PrivateAssetPackInformationPage = ({
           setAssetPack(assetPack);
           setSellerPublicProfile(profile);
         } catch (error) {
-          if (error.response && error.response.status === 404) {
+          const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+            error
+          );
+          if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
             setErrorText(
               <Trans>
                 Asset pack not found - An error occurred, please try again

diff --git a/newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetPackPurchaseDialog.js b/newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetPackPurchaseDialog.js
@@ -25,6 +25,7 @@ import {
   purchaseAppStoreProduct,
 } from '../../Utils/AppStorePurchases';
 import Form from '../../UI/Form';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 const PasswordPromptDialog = (props: {
   passwordValue: string,
@@ -131,10 +132,13 @@ const PrivateAssetPackPurchaseDialog = ({
       });
       Window.openExternalURL(checkoutUrl);
     } catch (error) {
+      const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+        error
+      );
       if (
-        error.response &&
-        error.response.status === 403 &&
-        error.response.data.code === 'auth/wrong-password'
+        extractedStatusAndCode &&
+        extractedStatusAndCode.status === 403 &&
+        extractedStatusAndCode.code === 'auth/wrong-password'
       ) {
         await showAlert({
           title: t`Operation not allowed`,

diff --git a/newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetsAuthorizationProvider.js b/newIDE/app/src/AssetStore/PrivateAssets/PrivateAssetsAuthorizationProvider.js
@@ -18,6 +18,7 @@ import {
   getAuthorizationTokenForPrivateAssets,
 } from '../../Utils/GDevelopServices/Shop';
 import PrivateAssetsAuthorizationContext from './PrivateAssetsAuthorizationContext';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 type Props = {| children: React.Node |};
 
@@ -94,7 +95,10 @@ const PrivateAssetsAuthorizationProvider = ({ children }: Props) => {
       });
       return asset;
     } catch (error) {
-      if (error.response && error.response.status === 404) {
+      const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+        error
+      );
+      if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
         // If the token is expired, fetch a new one and try again.
         token = await fetchAuthorizationToken(userId);
         const asset = await getPrivateAsset(assetShortHeader, token, {

diff --git a/newIDE/app/src/AssetStore/PrivateGameTemplates/PrivateGameTemplateInformationPage.js b/newIDE/app/src/AssetStore/PrivateGameTemplates/PrivateGameTemplateInformationPage.js
@@ -37,6 +37,7 @@ import { formatProductPrice } from '../ProductPriceTag';
 import AuthenticatedUserContext from '../../Profile/AuthenticatedUserContext';
 import { capitalize } from 'lodash';
 import FlatButton from '../../UI/FlatButton';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 const styles = {
   disabledText: { opacity: 0.6 },
@@ -123,7 +124,10 @@ const PrivateGameTemplateInformationPage = ({
           setGameTemplate(gameTemplate);
           setSellerPublicProfile(profile);
         } catch (error) {
-          if (error.response && error.response.status === 404) {
+          const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+            error
+          );
+          if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
             setErrorText(
               <Trans>
                 Game template not found - An error occurred, please try again

diff --git a/newIDE/app/src/AssetStore/PrivateGameTemplates/PrivateGameTemplatePurchaseDialog.js b/newIDE/app/src/AssetStore/PrivateGameTemplates/PrivateGameTemplatePurchaseDialog.js
@@ -25,6 +25,7 @@ import {
   purchaseAppStoreProduct,
 } from '../../Utils/AppStorePurchases';
 import Form from '../../UI/Form';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 const PasswordPromptDialog = (props: {
   passwordValue: string,
@@ -131,10 +132,13 @@ const PrivateGameTemplatePurchaseDialog = ({
       });
       Window.openExternalURL(checkoutUrl);
     } catch (error) {
+      const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+        error
+      );
       if (
-        error.response &&
-        error.response.status === 403 &&
-        error.response.data.code === 'auth/wrong-password'
+        extractedStatusAndCode &&
+        extractedStatusAndCode.status === 403 &&
+        extractedStatusAndCode.code === 'auth/wrong-password'
       ) {
         await showAlert({
           title: t`Operation not allowed`,

diff --git a/newIDE/app/src/ExportAndShare/ShareDialog/ExportLauncher.js b/newIDE/app/src/ExportAndShare/ShareDialog/ExportLauncher.js
@@ -35,6 +35,7 @@ import {
   addCreateBadgePreHookIfNotClaimed,
   TRIVIAL_FIRST_WEB_EXPORT,
 } from '../../Utils/GDevelopServices/Badge';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 type State = {|
   exportStep: BuildStep,
@@ -169,8 +170,11 @@ export default class ExportLauncher extends Component<Props, State> {
       try {
         // Try to fetch the game to see if it's registered but do not do anything with it.
         await getGame(getAuthorizationHeader, userId, gameId);
-      } catch (err) {
-        if (err.response.status === 404) {
+      } catch (error) {
+        const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+          error
+        );
+        if (extractedStatusAndCode && extractedStatusAndCode.code === 404) {
           // If the game is not registered, register it before launching the export.
           const authorName =
             this.props.project.getAuthor() || 'Unspecified publisher';

diff --git a/newIDE/app/src/ExportAndShare/ShareDialog/InviteHome.js b/newIDE/app/src/ExportAndShare/ShareDialog/InviteHome.js
@@ -33,6 +33,7 @@ import useAlertDialog from '../../UI/Alert/useAlertDialog';
 import SelectField from '../../UI/SelectField';
 import SelectOption from '../../UI/SelectOption';
 import Form from '../../UI/Form';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 export const emailRegex = /^(.+)@(.+)$/;
 
@@ -177,11 +178,14 @@ const InviteHome = ({ cloudProjectId }: Props) => {
         setProjectUserAcls(collaboratorProjectUserAcls);
       } catch (error) {
         console.error('Unable to fetch the project user acls', error);
-        if (error.response && error.response.status === 404) {
+        const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+          error
+        );
+        if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
           setFetchError('project-not-found');
           return;
         }
-        if (error.response && error.response.status === 403) {
+        if (extractedStatusAndCode && extractedStatusAndCode.status === 403) {
           setFetchError('project-not-owned');
           return;
         }
@@ -263,35 +267,39 @@ const InviteHome = ({ cloudProjectId }: Props) => {
       await fetchProjectUserAcls();
     } catch (error) {
       console.error('Unable to add collaborator', error);
-      if (error.response && error.response.status === 400) {
+      const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+        error
+      );
+      if (extractedStatusAndCode && extractedStatusAndCode.status === 400) {
         if (
-          error.response.data.code ===
+          extractedStatusAndCode.code ===
           'project-user-acl-creation/user-already-added'
         ) {
           setAddError('user-already-added');
           return;
         }
         if (
-          error.response.data.code === 'project-user-acl-creation/user-is-owner'
+          extractedStatusAndCode.code ===
+          'project-user-acl-creation/user-is-owner'
         ) {
           setAddError('user-owner');
           return;
         }
       }
-      if (error.response && error.response.status === 404) {
+      if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
         setAddError('user-not-found');
         return;
       }
-      if (error.response && error.response.status === 403) {
+      if (extractedStatusAndCode && extractedStatusAndCode.status === 403) {
         if (
-          error.response.data.code ===
+          extractedStatusAndCode.code ===
           'project-user-acl-creation/collaborators-not-allowed'
         ) {
           setAddError('not-allowed');
           return;
         }
         if (
-          error.response.data.code ===
+          extractedStatusAndCode.code ===
           'project-user-acl-creation/too-many-guest-collaborators-on-project'
         ) {
           setAddError('max-guest-collaborators');

diff --git a/newIDE/app/src/ExportAndShare/ShareDialog/index.js b/newIDE/app/src/ExportAndShare/ShareDialog/index.js
@@ -19,6 +19,7 @@ import PreferencesContext from '../../MainFrame/Preferences/PreferencesContext';
 import { type FileMetadata, type StorageProvider } from '../../ProjectsStorage';
 import { useOnlineStatus } from '../../Utils/OnlineStatus';
 import ErrorBoundary from '../../UI/ErrorBoundary';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 export type ShareTab = 'invite' | 'publish';
 export type ExporterSection = 'browser' | 'desktop' | 'mobile';
@@ -184,13 +185,16 @@ const ShareDialog = ({
           project.getProjectUuid()
         );
         setGame(game);
-      } catch (err) {
-        console.error('Unable to load the game', err);
-        if (err && err.status === 404) {
+      } catch (error) {
+        console.error('Unable to load the game', error);
+        const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+          error
+        );
+        if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
           setGameError('not-found');
           return;
         }
-        if (err && err.status === 403) {
+        if (extractedStatusAndCode && extractedStatusAndCode.status === 403) {
           setGameError('not-owned');
           return;
         }

diff --git a/newIDE/app/src/GameDashboard/GameRegistration.js b/newIDE/app/src/GameDashboard/GameRegistration.js
@@ -13,6 +13,7 @@ import {
   getGame,
   registerGame,
 } from '../Utils/GDevelopServices/Game';
+import { extractGDevelopApiErrorStatusAndCode } from '../Utils/GDevelopServices/Errors';
 
 export type GameRegistrationProps = {|
   project: ?gdProject,
@@ -65,19 +66,25 @@ export const GameRegistration = ({
         );
         setUnavailableReason(null);
         setGame(game);
-      } catch (err) {
-        console.error(err);
-        if (err.response) {
-          if (err.response.status === 403) {
+      } catch (error) {
+        console.error(
+          `Unable to get the game ${project.getProjectUuid()}`,
+          error
+        );
+        const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+          error
+        );
+        if (extractedStatusAndCode) {
+          if (extractedStatusAndCode.status === 403) {
             setUnavailableReason('unauthorized');
             return;
-          } else if (err.response.status === 404) {
+          } else if (extractedStatusAndCode.status === 404) {
             setUnavailableReason('not-existing');
             return;
           }
         }
 
-        setError(err);
+        setError(error);
       }
     },
     [project, getAuthorizationHeader, profile]

diff --git a/newIDE/app/src/GameDashboard/LeaderboardAdmin/index.js b/newIDE/app/src/GameDashboard/LeaderboardAdmin/index.js
@@ -72,6 +72,7 @@ import MaxLeaderboardCountAlertMessage from './MaxLeaderboardCountAlertMessage';
 import useAlertDialog from '../../UI/Alert/useAlertDialog';
 import Paper from '../../UI/Paper';
 import SwitchHorizontal from '../../UI/CustomSvgIcons/SwitchHorizontal';
+import { extractGDevelopApiErrorStatusAndCode } from '../../Utils/GDevelopServices/Errors';
 
 type Props = {|
   onLoading: boolean => void,
@@ -312,12 +313,15 @@ export const LeaderboardAdmin = ({
         setApiError(null);
         try {
           await listLeaderboards();
-        } catch (err) {
-          if (err.response && err.response.status === 404) {
+        } catch (error) {
+          const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+            error
+          );
+          if (extractedStatusAndCode && extractedStatusAndCode.status === 404) {
             setDisplayGameRegistration(true);
             return;
           }
-          console.error('An error occurred when fetching leaderboards', err);
+          console.error('An error occurred when fetching leaderboards', error);
           setApiError({
             action: 'leaderboardsFetching',
             message: (
@@ -406,12 +410,15 @@ export const LeaderboardAdmin = ({
     setApiError(null);
     try {
       await resetLeaderboard();
-    } catch (err) {
-      console.error('An error occurred when resetting leaderboard', err);
+    } catch (error) {
+      console.error('An error occurred when resetting leaderboard', error);
+      const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+        error
+      );
       setApiError({
         action: 'leaderboardReset',
         message:
-          err.status && err.status === 409 ? (
+          extractedStatusAndCode && extractedStatusAndCode.status === 409 ? (
             <Trans>
               This leaderboard is already resetting, please wait a bit, close
               the dialog, come back and try again.

diff --git a/newIDE/app/src/MainFrame/EditorContainers/HomePage/BuildSection/ProjectFileListItem.js b/newIDE/app/src/MainFrame/EditorContainers/HomePage/BuildSection/ProjectFileListItem.js
@@ -36,6 +36,7 @@ import { type LastModifiedInfo } from './utils';
 import DotBadge from '../../../../UI/DotBadge';
 import { type FileMetadata } from '../../../../ProjectsStorage';
 import StatusIndicator from './StatusIndicator';
+import { extractGDevelopApiErrorStatusAndCode } from '../../../../Utils/GDevelopServices/Errors';
 const electron = optionalRequire('electron');
 const path = optionalRequire('path');
 
@@ -260,8 +261,11 @@ export const ProjectFileListItem = ({
       await deleteCloudProject(authenticatedUser, fileMetadata.fileIdentifier);
       authenticatedUser.onCloudProjectsChanged();
     } catch (error) {
+      const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+        error
+      );
       const message =
-        error.response && error.response.status === 403
+        extractedStatusAndCode && extractedStatusAndCode.status === 403
           ? t`You don't have permissions to delete this project.`
           : t`An error occurred when saving the project. Please try again later.`;
       showAlert({

diff --git a/newIDE/app/src/MainFrame/EditorContainers/HomePage/TeamSection/TeamSection.spec.js b/newIDE/app/src/MainFrame/EditorContainers/HomePage/TeamSection/TeamSection.spec.js
@@ -9,6 +9,7 @@ const getDefaultUser = ({ id }: { id: string }) => ({
   description: null,
   username: null,
   donateLink: null,
+  discordUsername: null,
   email: `${id}@email.net`,
   getGameStatsEmail: false,
   getNewsletterEmail: false,

diff --git a/newIDE/app/src/MainFrame/index.js b/newIDE/app/src/MainFrame/index.js
@@ -184,6 +184,7 @@ import useEditorTabsStateSaving from './EditorTabs/UseEditorTabsStateSaving';
 import { type PrivateGameTemplateListingData } from '../Utils/GDevelopServices/Shop';
 import PixiResourcesLoader from '../ObjectsRendering/PixiResourcesLoader';
 import useResourcesWatcher from './ResourcesWatcher';
+import { extractGDevelopApiErrorStatusAndCode } from '../Utils/GDevelopServices/Errors';
 const GD_STARTUP_TIMES = global.GD_STARTUP_TIMES || [];
 
 const gd: libGDevelop = global.gd;
@@ -2489,8 +2490,11 @@ const MainFrame = (props: Props) => {
           _replaceSnackMessage(i18n._(t`Project properly saved`));
         }
       } catch (error) {
+        const extractedStatusAndCode = extractGDevelopApiErrorStatusAndCode(
+          error
+        );
         const message =
-          error.response && error.response.status === 403
+          extractedStatusAndCode && extractedStatusAndCode.status === 403
             ? t`You don't have permissions to save this project. Please choose another location.`
             : t`An error occurred when saving the project. Please try again later.`;
         showAlert({

diff --git a/newIDE/app/src/Profile/AuthenticatedUserProfileDetails.js b/newIDE/app/src/Profile/AuthenticatedUserProfileDetails.js
@@ -58,6 +58,7 @@ const AuthenticatedUserProfileDetails = ({
             ? { ...authenticatedUser.profile, email: firebaseUser.email }
             : null
         }
+        subscription={authenticatedUser.subscription}
         isAuthenticatedUserProfile
         onOpenChangeEmailDialog={onOpenChangeEmailDialog}
         onOpenEditProfileDialog={onOpenEditProfileDialog}