@strapi/admin 5.17.0 → 5.18.0

package/dist/admin/src/components/UnstableGuidedTour/Tours.d.ts

@@ -2,26 +2,57 @@ import * as React from 'react';
 import { type State, type Action } from './Context';
 import { Step } from './Step';
 declare const tours: {
-    readonly TEST: {
+    readonly contentTypeBuilder: {
         Introduction: React.ComponentType<{
             children: React.ReactNode;
         }>;
-        Done: React.ComponentType<{
+        CollectionTypes: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        SingleTypes: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        Components: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        Finish: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+    };
+    readonly contentManager: {
+        Introduction: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        Finish: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        Fields: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        Publish: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+    };
+    readonly apiTokens: {
+        Introduction: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        Finish: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        CreateAnAPIToken: React.ComponentType<{
+            children: React.ReactNode;
+        }>;
+        CopyAPIToken: React.ComponentType<{
             children: React.ReactNode;
         }>;
     };
+    readonly strapiCloud: {};
 };
 type Tours = typeof tours;
 type Content = (Step: Step, { state, dispatch, }: {
     state: State;
     dispatch: React.Dispatch<Action>;
 }) => React.ReactNode;
-export declare const GuidedTourOverlay: import("styled-components").IStyledComponent<"web", import("styled-components/dist/types").FastOmit<Omit<import("@strapi/design-system").TransientBoxProps & {
-    children?: React.ReactNode;
-} & import("@strapi/design-system/dist/types").AsProp<React.ElementType<any, keyof React.JSX.IntrinsicElements>> & Omit<Omit<any, "ref">, "children" | keyof import("@strapi/design-system/dist/types").AsProp<C> | keyof import("@strapi/design-system").TransientBoxProps> & {
-    ref?: any;
-}, "ref"> & {
-    ref?: any;
-}, never>> & Omit<import("@strapi/design-system").BoxComponent<"div">, keyof React.Component<any, {}, any>>;
 export type { Content, Tours };
 export { tours };

package/dist/admin/src/components/Widgets.d.ts

@@ -0,0 +1,2 @@
+declare const ProfileWidget: () => import("react/jsx-runtime").JSX.Element;
+export { ProfileWidget };

package/dist/admin/src/core/apis/Widgets.d.ts

@@ -14,7 +14,7 @@ type WidgetArgs = {
     component: () => Promise<React.ComponentType>;
     pluginId?: string;
     id: string;
-    permissions?: Permission[];
+    permissions?: Array<Pick<Permission, 'action'> & Partial<Omit<Permission, 'action'>>>;
 };
 type Widget = Omit<WidgetArgs, 'id' | 'pluginId'> & {
     uid: WidgetUID;

package/dist/admin/src/features/Auth.d.ts

@@ -19,7 +19,7 @@ interface AuthContextValue {
      * permission object form the API is returned. Therefore, if the list is
      * empty, the user does not have any of those permissions.
      */
-    checkUserHasPermissions: (permissions?: Permission[], passedPermissions?: Permission[], rawQueryContext?: string) => Promise<Permission[]>;
+    checkUserHasPermissions: (permissions?: Array<Pick<Permission, 'action'> & Partial<Omit<Permission, 'action'>>>, passedPermissions?: Permission[], rawQueryContext?: string) => Promise<Permission[]>;
     isLoading: boolean;
     permissions: Permission[];
     refetchPermissions: () => Promise<void>;

package/dist/admin/src/pages/Settings/components/Tokens/TokenBox.d.ts

@@ -2,5 +2,6 @@ interface TokenBoxProps {
     token?: string;
     tokenType: 'transfer-token' | 'api-token';
 }
+export declare const UnstableApiTokenBox: ({ token, tokenType }: TokenBoxProps) => import("react/jsx-runtime").JSX.Element;
 export declare const TokenBox: ({ token, tokenType }: TokenBoxProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/admin/src/utils/users.d.ts

@@ -3,5 +3,9 @@ import type { User } from '../features/Auth';
  * Retrieves the display name of an admin panel user
  */
 declare const getDisplayName: ({ firstname, lastname, username, email }?: Partial<User>) => string;
+/**
+ * Retrieves the initials of the user (based on their firstname / lastname or their display name)
+ */
+declare const getInitials: (user?: Partial<User>) => string;
 declare const hashAdminUserEmail: (payload?: User) => Promise<string | null>;
-export { getDisplayName, hashAdminUserEmail };
+export { getDisplayName, getInitials, hashAdminUserEmail };

package/dist/server/server/src/services/guided-tour.js

@@ -2,11 +2,29 @@
 
 var constants = require('./constants.js');
 
+const DEFAULT_ATTIBUTES = [
+    'createdAt',
+    'updatedAt',
+    'publishedAt',
+    'createdBy',
+    'updatedBy',
+    'locale',
+    'localizations'
+];
 const createGuidedTourService = ({ strapi })=>{
     const getCompletedActions = async ()=>{
-        // Check if any content-type schemas have been create on the api:: namespace
+        // Check if any content-type schemas have been created on the api:: namespace
         const contentTypeSchemaNames = Object.keys(strapi.contentTypes).filter((contentTypeUid)=>contentTypeUid.startsWith('api::'));
-        const didCreateContentTypeSchema = contentTypeSchemaNames.length > 0;
+        const contentTypeSchemaAttributes = contentTypeSchemaNames.map((uid)=>{
+            const attributes = Object.keys(strapi.contentType(uid).attributes);
+            return attributes.filter((attribute)=>!DEFAULT_ATTIBUTES.includes(attribute));
+        });
+        const didCreateContentTypeSchema = (()=>{
+            if (contentTypeSchemaNames.length === 0) {
+                return false;
+            }
+            return contentTypeSchemaAttributes.some((attributes)=>attributes.length > 0);
+        })();
         // Check if any content has been created for content-types on the api:: namespace
         const hasContent = await (async ()=>{
             for (const name of contentTypeSchemaNames){

package/dist/server/server/src/services/guided-tour.js.map

@@ -1 +1 @@
-{"version":3,"file":"guided-tour.js","sources":["../../../../../server/src/services/guided-tour.ts"],"sourcesContent":["import { Core, Internal } from '@strapi/types';\nimport constants from './constants';\n\nexport type GuidedTourRequiredActions = {\n  didCreateContentTypeSchema: boolean;\n  didCreateContent: boolean;\n  didCreateApiToken: boolean;\n};\nexport type GuidedTourCompletedActions = keyof GuidedTourRequiredActions;\n\nexport const createGuidedTourService = ({ strapi }: { strapi: Core.Strapi }) => {\n  const getCompletedActions = async () => {\n    // Check if any content-type schemas have been create on the api:: namespace\n    const contentTypeSchemaNames = Object.keys(strapi.contentTypes).filter((contentTypeUid) =>\n      contentTypeUid.startsWith('api::')\n    );\n    const didCreateContentTypeSchema = contentTypeSchemaNames.length > 0;\n\n    // Check if any content has been created for content-types on the api:: namespace\n    const hasContent = await (async () => {\n      for (const name of contentTypeSchemaNames) {\n        const count = await strapi.documents(name as Internal.UID.ContentType).count({});\n\n        if (count > 0) return true;\n      }\n\n      return false;\n    })();\n    const didCreateContent = didCreateContentTypeSchema && hasContent;\n\n    // Check if any api tokens have been created besides the default ones\n    const createdApiTokens = await strapi\n      .documents('admin::api-token')\n      .findMany({ fields: ['name', 'description'] });\n    const didCreateApiToken = createdApiTokens.some((doc) =>\n      constants.DEFAULT_API_TOKENS.every(\n        (token) => token.name !== doc.name && token.description !== doc.description\n      )\n    );\n\n    // Compute an array of action names that have been completed\n    const requiredActions = {\n      didCreateContentTypeSchema,\n      didCreateContent,\n      didCreateApiToken,\n    };\n    const requiredActionNames = Object.keys(requiredActions) as Array<GuidedTourCompletedActions>;\n    const completedActions = requiredActionNames.filter((key) => requiredActions[key]);\n\n    return completedActions;\n  };\n\n  return {\n    getCompletedActions,\n  };\n};\n"],"names":["createGuidedTourService","strapi","getCompletedActions","contentTypeSchemaNames","Object","keys","contentTypes","filter","contentTypeUid","startsWith","didCreateContentTypeSchema","length","hasContent","name","count","documents","didCreateContent","createdApiTokens","findMany","fields","didCreateApiToken","some","doc","constants","DEFAULT_API_TOKENS","every","token","description","requiredActions","requiredActionNames","completedActions","key"],"mappings":";;;;AAUaA,MAAAA,uBAAAA,GAA0B,CAAC,EAAEC,MAAM,EAA2B,GAAA;AACzE,IAAA,MAAMC,mBAAsB,GAAA,UAAA;;AAE1B,QAAA,MAAMC,sBAAyBC,GAAAA,MAAAA,CAAOC,IAAI,CAACJ,MAAOK,CAAAA,YAAY,CAAEC,CAAAA,MAAM,CAAC,CAACC,cACtEA,GAAAA,cAAAA,CAAeC,UAAU,CAAC,OAAA,CAAA,CAAA;QAE5B,MAAMC,0BAAAA,GAA6BP,sBAAuBQ,CAAAA,MAAM,GAAG,CAAA;;QAGnE,MAAMC,UAAAA,GAAa,MAAO,CAAA,UAAA;YACxB,KAAK,MAAMC,QAAQV,sBAAwB,CAAA;gBACzC,MAAMW,KAAAA,GAAQ,MAAMb,MAAOc,CAAAA,SAAS,CAACF,IAAkCC,CAAAA,CAAAA,KAAK,CAAC,EAAC,CAAA;gBAE9E,IAAIA,KAAAA,GAAQ,GAAG,OAAO,IAAA;AACxB;YAEA,OAAO,KAAA;SACT,GAAA;AACA,QAAA,MAAME,mBAAmBN,0BAA8BE,IAAAA,UAAAA;;AAGvD,QAAA,MAAMK,mBAAmB,MAAMhB,MAAAA,CAC5Bc,SAAS,CAAC,kBAAA,CAAA,CACVG,QAAQ,CAAC;YAAEC,MAAQ,EAAA;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAc;AAAC,SAAA,CAAA;QAC9C,MAAMC,iBAAAA,GAAoBH,iBAAiBI,IAAI,CAAC,CAACC,GAC/CC,GAAAA,SAAAA,CAAUC,kBAAkB,CAACC,KAAK,CAChC,CAACC,KAAUA,GAAAA,KAAAA,CAAMb,IAAI,KAAKS,GAAIT,CAAAA,IAAI,IAAIa,KAAMC,CAAAA,WAAW,KAAKL,GAAAA,CAAIK,WAAW,CAAA,CAAA;;AAK/E,QAAA,MAAMC,eAAkB,GAAA;AACtBlB,YAAAA,0BAAAA;AACAM,YAAAA,gBAAAA;AACAI,YAAAA;AACF,SAAA;QACA,MAAMS,mBAAAA,GAAsBzB,MAAOC,CAAAA,IAAI,CAACuB,eAAAA,CAAAA;QACxC,MAAME,gBAAAA,GAAmBD,oBAAoBtB,MAAM,CAAC,CAACwB,GAAQH,GAAAA,eAAe,CAACG,GAAI,CAAA,CAAA;QAEjF,OAAOD,gBAAAA;AACT,KAAA;IAEA,OAAO;AACL5B,QAAAA;AACF,KAAA;AACF;;;;"}
+{"version":3,"file":"guided-tour.js","sources":["../../../../../server/src/services/guided-tour.ts"],"sourcesContent":["import { Core, Internal } from '@strapi/types';\nimport constants from './constants';\n\nexport type GuidedTourRequiredActions = {\n  didCreateContentTypeSchema: boolean;\n  didCreateContent: boolean;\n  didCreateApiToken: boolean;\n};\nexport type GuidedTourCompletedActions = keyof GuidedTourRequiredActions;\n\nconst DEFAULT_ATTIBUTES = [\n  'createdAt',\n  'updatedAt',\n  'publishedAt',\n  'createdBy',\n  'updatedBy',\n  'locale',\n  'localizations',\n];\n\nexport const createGuidedTourService = ({ strapi }: { strapi: Core.Strapi }) => {\n  const getCompletedActions = async () => {\n    // Check if any content-type schemas have been created on the api:: namespace\n    const contentTypeSchemaNames = Object.keys(strapi.contentTypes).filter((contentTypeUid) =>\n      contentTypeUid.startsWith('api::')\n    );\n    const contentTypeSchemaAttributes = contentTypeSchemaNames.map((uid) => {\n      const attributes = Object.keys(\n        strapi.contentType(uid as Internal.UID.ContentType).attributes\n      );\n      return attributes.filter((attribute) => !DEFAULT_ATTIBUTES.includes(attribute));\n    });\n    const didCreateContentTypeSchema = (() => {\n      if (contentTypeSchemaNames.length === 0) {\n        return false;\n      }\n      return contentTypeSchemaAttributes.some((attributes) => attributes.length > 0);\n    })();\n\n    // Check if any content has been created for content-types on the api:: namespace\n    const hasContent = await (async () => {\n      for (const name of contentTypeSchemaNames) {\n        const count = await strapi.documents(name as Internal.UID.ContentType).count({});\n\n        if (count > 0) return true;\n      }\n\n      return false;\n    })();\n    const didCreateContent = didCreateContentTypeSchema && hasContent;\n\n    // Check if any api tokens have been created besides the default ones\n    const createdApiTokens = await strapi\n      .documents('admin::api-token')\n      .findMany({ fields: ['name', 'description'] });\n    const didCreateApiToken = createdApiTokens.some((doc) =>\n      constants.DEFAULT_API_TOKENS.every(\n        (token) => token.name !== doc.name && token.description !== doc.description\n      )\n    );\n\n    // Compute an array of action names that have been completed\n    const requiredActions = {\n      didCreateContentTypeSchema,\n      didCreateContent,\n      didCreateApiToken,\n    };\n    const requiredActionNames = Object.keys(requiredActions) as Array<GuidedTourCompletedActions>;\n    const completedActions = requiredActionNames.filter((key) => requiredActions[key]);\n\n    return completedActions;\n  };\n\n  return {\n    getCompletedActions,\n  };\n};\n"],"names":["DEFAULT_ATTIBUTES","createGuidedTourService","strapi","getCompletedActions","contentTypeSchemaNames","Object","keys","contentTypes","filter","contentTypeUid","startsWith","contentTypeSchemaAttributes","map","uid","attributes","contentType","attribute","includes","didCreateContentTypeSchema","length","some","hasContent","name","count","documents","didCreateContent","createdApiTokens","findMany","fields","didCreateApiToken","doc","constants","DEFAULT_API_TOKENS","every","token","description","requiredActions","requiredActionNames","completedActions","key"],"mappings":";;;;AAUA,MAAMA,iBAAoB,GAAA;AACxB,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,aAAA;AACA,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,QAAA;AACA,IAAA;AACD,CAAA;AAEYC,MAAAA,uBAAAA,GAA0B,CAAC,EAAEC,MAAM,EAA2B,GAAA;AACzE,IAAA,MAAMC,mBAAsB,GAAA,UAAA;;AAE1B,QAAA,MAAMC,sBAAyBC,GAAAA,MAAAA,CAAOC,IAAI,CAACJ,MAAOK,CAAAA,YAAY,CAAEC,CAAAA,MAAM,CAAC,CAACC,cACtEA,GAAAA,cAAAA,CAAeC,UAAU,CAAC,OAAA,CAAA,CAAA;AAE5B,QAAA,MAAMC,2BAA8BP,GAAAA,sBAAAA,CAAuBQ,GAAG,CAAC,CAACC,GAAAA,GAAAA;YAC9D,MAAMC,UAAAA,GAAaT,OAAOC,IAAI,CAC5BJ,OAAOa,WAAW,CAACF,KAAiCC,UAAU,CAAA;YAEhE,OAAOA,UAAAA,CAAWN,MAAM,CAAC,CAACQ,YAAc,CAAChB,iBAAAA,CAAkBiB,QAAQ,CAACD,SAAAA,CAAAA,CAAAA;AACtE,SAAA,CAAA;QACA,MAAME,0BAAAA,GAA6B,CAAC,IAAA;YAClC,IAAId,sBAAAA,CAAuBe,MAAM,KAAK,CAAG,EAAA;gBACvC,OAAO,KAAA;AACT;AACA,YAAA,OAAOR,4BAA4BS,IAAI,CAAC,CAACN,UAAeA,GAAAA,UAAAA,CAAWK,MAAM,GAAG,CAAA,CAAA;SAC9E,GAAA;;QAGA,MAAME,UAAAA,GAAa,MAAO,CAAA,UAAA;YACxB,KAAK,MAAMC,QAAQlB,sBAAwB,CAAA;gBACzC,MAAMmB,KAAAA,GAAQ,MAAMrB,MAAOsB,CAAAA,SAAS,CAACF,IAAkCC,CAAAA,CAAAA,KAAK,CAAC,EAAC,CAAA;gBAE9E,IAAIA,KAAAA,GAAQ,GAAG,OAAO,IAAA;AACxB;YAEA,OAAO,KAAA;SACT,GAAA;AACA,QAAA,MAAME,mBAAmBP,0BAA8BG,IAAAA,UAAAA;;AAGvD,QAAA,MAAMK,mBAAmB,MAAMxB,MAAAA,CAC5BsB,SAAS,CAAC,kBAAA,CAAA,CACVG,QAAQ,CAAC;YAAEC,MAAQ,EAAA;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAc;AAAC,SAAA,CAAA;QAC9C,MAAMC,iBAAAA,GAAoBH,iBAAiBN,IAAI,CAAC,CAACU,GAC/CC,GAAAA,SAAAA,CAAUC,kBAAkB,CAACC,KAAK,CAChC,CAACC,KAAUA,GAAAA,KAAAA,CAAMZ,IAAI,KAAKQ,GAAIR,CAAAA,IAAI,IAAIY,KAAMC,CAAAA,WAAW,KAAKL,GAAAA,CAAIK,WAAW,CAAA,CAAA;;AAK/E,QAAA,MAAMC,eAAkB,GAAA;AACtBlB,YAAAA,0BAAAA;AACAO,YAAAA,gBAAAA;AACAI,YAAAA;AACF,SAAA;QACA,MAAMQ,mBAAAA,GAAsBhC,MAAOC,CAAAA,IAAI,CAAC8B,eAAAA,CAAAA;QACxC,MAAME,gBAAAA,GAAmBD,oBAAoB7B,MAAM,CAAC,CAAC+B,GAAQH,GAAAA,eAAe,CAACG,GAAI,CAAA,CAAA;QAEjF,OAAOD,gBAAAA;AACT,KAAA;IAEA,OAAO;AACLnC,QAAAA;AACF,KAAA;AACF;;;;"}

package/dist/server/server/src/services/guided-tour.mjs

@@ -1,10 +1,28 @@
 import constants from './constants.mjs';
 
+const DEFAULT_ATTIBUTES = [
+    'createdAt',
+    'updatedAt',
+    'publishedAt',
+    'createdBy',
+    'updatedBy',
+    'locale',
+    'localizations'
+];
 const createGuidedTourService = ({ strapi })=>{
     const getCompletedActions = async ()=>{
-        // Check if any content-type schemas have been create on the api:: namespace
+        // Check if any content-type schemas have been created on the api:: namespace
         const contentTypeSchemaNames = Object.keys(strapi.contentTypes).filter((contentTypeUid)=>contentTypeUid.startsWith('api::'));
-        const didCreateContentTypeSchema = contentTypeSchemaNames.length > 0;
+        const contentTypeSchemaAttributes = contentTypeSchemaNames.map((uid)=>{
+            const attributes = Object.keys(strapi.contentType(uid).attributes);
+            return attributes.filter((attribute)=>!DEFAULT_ATTIBUTES.includes(attribute));
+        });
+        const didCreateContentTypeSchema = (()=>{
+            if (contentTypeSchemaNames.length === 0) {
+                return false;
+            }
+            return contentTypeSchemaAttributes.some((attributes)=>attributes.length > 0);
+        })();
         // Check if any content has been created for content-types on the api:: namespace
         const hasContent = await (async ()=>{
             for (const name of contentTypeSchemaNames){

package/dist/server/server/src/services/guided-tour.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"guided-tour.mjs","sources":["../../../../../server/src/services/guided-tour.ts"],"sourcesContent":["import { Core, Internal } from '@strapi/types';\nimport constants from './constants';\n\nexport type GuidedTourRequiredActions = {\n  didCreateContentTypeSchema: boolean;\n  didCreateContent: boolean;\n  didCreateApiToken: boolean;\n};\nexport type GuidedTourCompletedActions = keyof GuidedTourRequiredActions;\n\nexport const createGuidedTourService = ({ strapi }: { strapi: Core.Strapi }) => {\n  const getCompletedActions = async () => {\n    // Check if any content-type schemas have been create on the api:: namespace\n    const contentTypeSchemaNames = Object.keys(strapi.contentTypes).filter((contentTypeUid) =>\n      contentTypeUid.startsWith('api::')\n    );\n    const didCreateContentTypeSchema = contentTypeSchemaNames.length > 0;\n\n    // Check if any content has been created for content-types on the api:: namespace\n    const hasContent = await (async () => {\n      for (const name of contentTypeSchemaNames) {\n        const count = await strapi.documents(name as Internal.UID.ContentType).count({});\n\n        if (count > 0) return true;\n      }\n\n      return false;\n    })();\n    const didCreateContent = didCreateContentTypeSchema && hasContent;\n\n    // Check if any api tokens have been created besides the default ones\n    const createdApiTokens = await strapi\n      .documents('admin::api-token')\n      .findMany({ fields: ['name', 'description'] });\n    const didCreateApiToken = createdApiTokens.some((doc) =>\n      constants.DEFAULT_API_TOKENS.every(\n        (token) => token.name !== doc.name && token.description !== doc.description\n      )\n    );\n\n    // Compute an array of action names that have been completed\n    const requiredActions = {\n      didCreateContentTypeSchema,\n      didCreateContent,\n      didCreateApiToken,\n    };\n    const requiredActionNames = Object.keys(requiredActions) as Array<GuidedTourCompletedActions>;\n    const completedActions = requiredActionNames.filter((key) => requiredActions[key]);\n\n    return completedActions;\n  };\n\n  return {\n    getCompletedActions,\n  };\n};\n"],"names":["createGuidedTourService","strapi","getCompletedActions","contentTypeSchemaNames","Object","keys","contentTypes","filter","contentTypeUid","startsWith","didCreateContentTypeSchema","length","hasContent","name","count","documents","didCreateContent","createdApiTokens","findMany","fields","didCreateApiToken","some","doc","constants","DEFAULT_API_TOKENS","every","token","description","requiredActions","requiredActionNames","completedActions","key"],"mappings":";;AAUaA,MAAAA,uBAAAA,GAA0B,CAAC,EAAEC,MAAM,EAA2B,GAAA;AACzE,IAAA,MAAMC,mBAAsB,GAAA,UAAA;;AAE1B,QAAA,MAAMC,sBAAyBC,GAAAA,MAAAA,CAAOC,IAAI,CAACJ,MAAOK,CAAAA,YAAY,CAAEC,CAAAA,MAAM,CAAC,CAACC,cACtEA,GAAAA,cAAAA,CAAeC,UAAU,CAAC,OAAA,CAAA,CAAA;QAE5B,MAAMC,0BAAAA,GAA6BP,sBAAuBQ,CAAAA,MAAM,GAAG,CAAA;;QAGnE,MAAMC,UAAAA,GAAa,MAAO,CAAA,UAAA;YACxB,KAAK,MAAMC,QAAQV,sBAAwB,CAAA;gBACzC,MAAMW,KAAAA,GAAQ,MAAMb,MAAOc,CAAAA,SAAS,CAACF,IAAkCC,CAAAA,CAAAA,KAAK,CAAC,EAAC,CAAA;gBAE9E,IAAIA,KAAAA,GAAQ,GAAG,OAAO,IAAA;AACxB;YAEA,OAAO,KAAA;SACT,GAAA;AACA,QAAA,MAAME,mBAAmBN,0BAA8BE,IAAAA,UAAAA;;AAGvD,QAAA,MAAMK,mBAAmB,MAAMhB,MAAAA,CAC5Bc,SAAS,CAAC,kBAAA,CAAA,CACVG,QAAQ,CAAC;YAAEC,MAAQ,EAAA;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAc;AAAC,SAAA,CAAA;QAC9C,MAAMC,iBAAAA,GAAoBH,iBAAiBI,IAAI,CAAC,CAACC,GAC/CC,GAAAA,SAAAA,CAAUC,kBAAkB,CAACC,KAAK,CAChC,CAACC,KAAUA,GAAAA,KAAAA,CAAMb,IAAI,KAAKS,GAAIT,CAAAA,IAAI,IAAIa,KAAMC,CAAAA,WAAW,KAAKL,GAAAA,CAAIK,WAAW,CAAA,CAAA;;AAK/E,QAAA,MAAMC,eAAkB,GAAA;AACtBlB,YAAAA,0BAAAA;AACAM,YAAAA,gBAAAA;AACAI,YAAAA;AACF,SAAA;QACA,MAAMS,mBAAAA,GAAsBzB,MAAOC,CAAAA,IAAI,CAACuB,eAAAA,CAAAA;QACxC,MAAME,gBAAAA,GAAmBD,oBAAoBtB,MAAM,CAAC,CAACwB,GAAQH,GAAAA,eAAe,CAACG,GAAI,CAAA,CAAA;QAEjF,OAAOD,gBAAAA;AACT,KAAA;IAEA,OAAO;AACL5B,QAAAA;AACF,KAAA;AACF;;;;"}
+{"version":3,"file":"guided-tour.mjs","sources":["../../../../../server/src/services/guided-tour.ts"],"sourcesContent":["import { Core, Internal } from '@strapi/types';\nimport constants from './constants';\n\nexport type GuidedTourRequiredActions = {\n  didCreateContentTypeSchema: boolean;\n  didCreateContent: boolean;\n  didCreateApiToken: boolean;\n};\nexport type GuidedTourCompletedActions = keyof GuidedTourRequiredActions;\n\nconst DEFAULT_ATTIBUTES = [\n  'createdAt',\n  'updatedAt',\n  'publishedAt',\n  'createdBy',\n  'updatedBy',\n  'locale',\n  'localizations',\n];\n\nexport const createGuidedTourService = ({ strapi }: { strapi: Core.Strapi }) => {\n  const getCompletedActions = async () => {\n    // Check if any content-type schemas have been created on the api:: namespace\n    const contentTypeSchemaNames = Object.keys(strapi.contentTypes).filter((contentTypeUid) =>\n      contentTypeUid.startsWith('api::')\n    );\n    const contentTypeSchemaAttributes = contentTypeSchemaNames.map((uid) => {\n      const attributes = Object.keys(\n        strapi.contentType(uid as Internal.UID.ContentType).attributes\n      );\n      return attributes.filter((attribute) => !DEFAULT_ATTIBUTES.includes(attribute));\n    });\n    const didCreateContentTypeSchema = (() => {\n      if (contentTypeSchemaNames.length === 0) {\n        return false;\n      }\n      return contentTypeSchemaAttributes.some((attributes) => attributes.length > 0);\n    })();\n\n    // Check if any content has been created for content-types on the api:: namespace\n    const hasContent = await (async () => {\n      for (const name of contentTypeSchemaNames) {\n        const count = await strapi.documents(name as Internal.UID.ContentType).count({});\n\n        if (count > 0) return true;\n      }\n\n      return false;\n    })();\n    const didCreateContent = didCreateContentTypeSchema && hasContent;\n\n    // Check if any api tokens have been created besides the default ones\n    const createdApiTokens = await strapi\n      .documents('admin::api-token')\n      .findMany({ fields: ['name', 'description'] });\n    const didCreateApiToken = createdApiTokens.some((doc) =>\n      constants.DEFAULT_API_TOKENS.every(\n        (token) => token.name !== doc.name && token.description !== doc.description\n      )\n    );\n\n    // Compute an array of action names that have been completed\n    const requiredActions = {\n      didCreateContentTypeSchema,\n      didCreateContent,\n      didCreateApiToken,\n    };\n    const requiredActionNames = Object.keys(requiredActions) as Array<GuidedTourCompletedActions>;\n    const completedActions = requiredActionNames.filter((key) => requiredActions[key]);\n\n    return completedActions;\n  };\n\n  return {\n    getCompletedActions,\n  };\n};\n"],"names":["DEFAULT_ATTIBUTES","createGuidedTourService","strapi","getCompletedActions","contentTypeSchemaNames","Object","keys","contentTypes","filter","contentTypeUid","startsWith","contentTypeSchemaAttributes","map","uid","attributes","contentType","attribute","includes","didCreateContentTypeSchema","length","some","hasContent","name","count","documents","didCreateContent","createdApiTokens","findMany","fields","didCreateApiToken","doc","constants","DEFAULT_API_TOKENS","every","token","description","requiredActions","requiredActionNames","completedActions","key"],"mappings":";;AAUA,MAAMA,iBAAoB,GAAA;AACxB,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,aAAA;AACA,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,QAAA;AACA,IAAA;AACD,CAAA;AAEYC,MAAAA,uBAAAA,GAA0B,CAAC,EAAEC,MAAM,EAA2B,GAAA;AACzE,IAAA,MAAMC,mBAAsB,GAAA,UAAA;;AAE1B,QAAA,MAAMC,sBAAyBC,GAAAA,MAAAA,CAAOC,IAAI,CAACJ,MAAOK,CAAAA,YAAY,CAAEC,CAAAA,MAAM,CAAC,CAACC,cACtEA,GAAAA,cAAAA,CAAeC,UAAU,CAAC,OAAA,CAAA,CAAA;AAE5B,QAAA,MAAMC,2BAA8BP,GAAAA,sBAAAA,CAAuBQ,GAAG,CAAC,CAACC,GAAAA,GAAAA;YAC9D,MAAMC,UAAAA,GAAaT,OAAOC,IAAI,CAC5BJ,OAAOa,WAAW,CAACF,KAAiCC,UAAU,CAAA;YAEhE,OAAOA,UAAAA,CAAWN,MAAM,CAAC,CAACQ,YAAc,CAAChB,iBAAAA,CAAkBiB,QAAQ,CAACD,SAAAA,CAAAA,CAAAA;AACtE,SAAA,CAAA;QACA,MAAME,0BAAAA,GAA6B,CAAC,IAAA;YAClC,IAAId,sBAAAA,CAAuBe,MAAM,KAAK,CAAG,EAAA;gBACvC,OAAO,KAAA;AACT;AACA,YAAA,OAAOR,4BAA4BS,IAAI,CAAC,CAACN,UAAeA,GAAAA,UAAAA,CAAWK,MAAM,GAAG,CAAA,CAAA;SAC9E,GAAA;;QAGA,MAAME,UAAAA,GAAa,MAAO,CAAA,UAAA;YACxB,KAAK,MAAMC,QAAQlB,sBAAwB,CAAA;gBACzC,MAAMmB,KAAAA,GAAQ,MAAMrB,MAAOsB,CAAAA,SAAS,CAACF,IAAkCC,CAAAA,CAAAA,KAAK,CAAC,EAAC,CAAA;gBAE9E,IAAIA,KAAAA,GAAQ,GAAG,OAAO,IAAA;AACxB;YAEA,OAAO,KAAA;SACT,GAAA;AACA,QAAA,MAAME,mBAAmBP,0BAA8BG,IAAAA,UAAAA;;AAGvD,QAAA,MAAMK,mBAAmB,MAAMxB,MAAAA,CAC5BsB,SAAS,CAAC,kBAAA,CAAA,CACVG,QAAQ,CAAC;YAAEC,MAAQ,EAAA;AAAC,gBAAA,MAAA;AAAQ,gBAAA;AAAc;AAAC,SAAA,CAAA;QAC9C,MAAMC,iBAAAA,GAAoBH,iBAAiBN,IAAI,CAAC,CAACU,GAC/CC,GAAAA,SAAAA,CAAUC,kBAAkB,CAACC,KAAK,CAChC,CAACC,KAAUA,GAAAA,KAAAA,CAAMZ,IAAI,KAAKQ,GAAIR,CAAAA,IAAI,IAAIY,KAAMC,CAAAA,WAAW,KAAKL,GAAAA,CAAIK,WAAW,CAAA,CAAA;;AAK/E,QAAA,MAAMC,eAAkB,GAAA;AACtBlB,YAAAA,0BAAAA;AACAO,YAAAA,gBAAAA;AACAI,YAAAA;AACF,SAAA;QACA,MAAMQ,mBAAAA,GAAsBhC,MAAOC,CAAAA,IAAI,CAAC8B,eAAAA,CAAAA;QACxC,MAAME,gBAAAA,GAAmBD,oBAAoB7B,MAAM,CAAC,CAAC+B,GAAQH,GAAAA,eAAe,CAACG,GAAI,CAAA,CAAA;QAEjF,OAAOD,gBAAAA;AACT,KAAA;IAEA,OAAO;AACLnC,QAAAA;AACF,KAAA;AACF;;;;"}

package/dist/server/server/src/strategies/api-token.js

@@ -51,10 +51,21 @@ const extractToken = (ctx)=>{
             };
         }
     }
-    // update lastUsedAt if the token has not been used in the last hour
-    // @ts-expect-error - FIXME: verify lastUsedAt is defined
-    const hoursSinceLastUsed = dateFns.differenceInHours(currentDate, dateFns.parseISO(apiToken.lastUsedAt));
-    if (hoursSinceLastUsed >= 1) {
+    if (!fp.isNil(apiToken.lastUsedAt)) {
+        // update lastUsedAt if the token has not been used in the last hour
+        const hoursSinceLastUsed = dateFns.differenceInHours(currentDate, dateFns.parseISO(apiToken.lastUsedAt));
+        if (hoursSinceLastUsed >= 1) {
+            await strapi.db.query('admin::api-token').update({
+                where: {
+                    id: apiToken.id
+                },
+                data: {
+                    lastUsedAt: currentDate
+                }
+            });
+        }
+    } else {
+        // If lastUsedAt is not set, initialize it to the current date
         await strapi.db.query('admin::api-token').update({
             where: {
                 id: apiToken.id

package/dist/server/server/src/strategies/api-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-token.js","sources":["../../../../../server/src/strategies/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\nimport { castArray, isNil } from 'lodash/fp';\nimport { differenceInHours, parseISO } from 'date-fns';\nimport { errors } from '@strapi/utils';\nimport constants from '../services/constants';\nimport { getService } from '../utils';\nimport '@strapi/types';\n\nconst { UnauthorizedError, ForbiddenError } = errors;\n\nconst isReadScope = (scope: any) => scope.endsWith('find') || scope.endsWith('findOne');\n\nconst extractToken = (ctx: Context) => {\n  if (ctx.request && ctx.request.header && ctx.request.header.authorization) {\n    const parts = ctx.request.header.authorization.split(/\\s+/);\n\n    if (parts[0].toLowerCase() !== 'bearer' || parts.length !== 2) {\n      return null;\n    }\n\n    return parts[1];\n  }\n\n  return null;\n};\n\n/**\n * Authenticate the validity of the token\n */\nexport const authenticate = async (ctx: Context) => {\n  const apiTokenService = getService('api-token');\n  const token = extractToken(ctx);\n\n  if (!token) {\n    return { authenticated: false };\n  }\n\n  const apiToken = await apiTokenService.getBy({\n    accessKey: apiTokenService.hash(token),\n  });\n\n  // token not found\n  if (!apiToken) {\n    return { authenticated: false };\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      return { authenticated: false, error: new UnauthorizedError('Token expired') };\n    }\n  }\n\n  // update lastUsedAt if the token has not been used in the last hour\n  // @ts-expect-error - FIXME: verify lastUsedAt is defined\n  const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));\n  if (hoursSinceLastUsed >= 1) {\n    await strapi.db.query('admin::api-token').update({\n      where: { id: apiToken.id },\n      data: { lastUsedAt: currentDate },\n    });\n  }\n\n  if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    const ability = await strapi.contentAPI.permissions.engine.generateAbility(\n      apiToken.permissions.map((action: any) => ({ action }))\n    );\n\n    return { authenticated: true, ability, credentials: apiToken };\n  }\n\n  return { authenticated: true, credentials: apiToken };\n};\n\n/**\n * Verify the token has the required abilities for the requested scope\n *\n *  @type {import('.').VerifyFunction}\n */\nexport const verify = (auth: any, config: any) => {\n  const { credentials: apiToken, ability } = auth;\n\n  if (!apiToken) {\n    throw new UnauthorizedError('Token not found');\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      throw new UnauthorizedError('Token expired');\n    }\n  }\n\n  // Full access\n  if (apiToken.type === constants.API_TOKEN_TYPE.FULL_ACCESS) {\n    return;\n  }\n\n  // Read only\n  if (apiToken.type === constants.API_TOKEN_TYPE.READ_ONLY) {\n    /**\n     * If you don't have `full-access` you can only access `find` and `findOne`\n     * scopes. If the route has no scope, then you can't get access to it.\n     */\n    const scopes = castArray(config.scope);\n\n    if (config.scope && scopes.every(isReadScope)) {\n      return;\n    }\n  }\n\n  // Custom\n  else if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    if (!ability) {\n      throw new ForbiddenError();\n    }\n\n    const scopes = castArray(config.scope);\n\n    const isAllowed = scopes.every((scope) => ability.can(scope));\n\n    if (isAllowed) {\n      return;\n    }\n  }\n\n  throw new ForbiddenError();\n};\n\nexport const name = 'api-token';\n\nexport default {\n  name: 'api-token',\n  authenticate,\n  verify,\n};\n"],"names":["UnauthorizedError","ForbiddenError","errors","isReadScope","scope","endsWith","extractToken","ctx","request","header","authorization","parts","split","toLowerCase","length","authenticate","apiTokenService","getService","token","authenticated","apiToken","getBy","accessKey","hash","currentDate","Date","isNil","expiresAt","expirationDate","error","hoursSinceLastUsed","differenceInHours","parseISO","lastUsedAt","strapi","db","query","update","where","id","data","type","constants","API_TOKEN_TYPE","CUSTOM","ability","contentAPI","permissions","engine","generateAbility","map","action","credentials","verify","auth","config","FULL_ACCESS","READ_ONLY","scopes","castArray","every","isAllowed","can","name"],"mappings":"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"}
+{"version":3,"file":"api-token.js","sources":["../../../../../server/src/strategies/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\nimport { castArray, isNil } from 'lodash/fp';\nimport { differenceInHours, parseISO } from 'date-fns';\nimport { errors } from '@strapi/utils';\nimport constants from '../services/constants';\nimport { getService } from '../utils';\nimport '@strapi/types';\n\nconst { UnauthorizedError, ForbiddenError } = errors;\n\nconst isReadScope = (scope: any) => scope.endsWith('find') || scope.endsWith('findOne');\n\nconst extractToken = (ctx: Context) => {\n  if (ctx.request && ctx.request.header && ctx.request.header.authorization) {\n    const parts = ctx.request.header.authorization.split(/\\s+/);\n\n    if (parts[0].toLowerCase() !== 'bearer' || parts.length !== 2) {\n      return null;\n    }\n\n    return parts[1];\n  }\n\n  return null;\n};\n\n/**\n * Authenticate the validity of the token\n */\nexport const authenticate = async (ctx: Context) => {\n  const apiTokenService = getService('api-token');\n  const token = extractToken(ctx);\n\n  if (!token) {\n    return { authenticated: false };\n  }\n\n  const apiToken = await apiTokenService.getBy({\n    accessKey: apiTokenService.hash(token),\n  });\n\n  // token not found\n  if (!apiToken) {\n    return { authenticated: false };\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      return { authenticated: false, error: new UnauthorizedError('Token expired') };\n    }\n  }\n\n  if (!isNil(apiToken.lastUsedAt)) {\n    // update lastUsedAt if the token has not been used in the last hour\n    const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));\n    if (hoursSinceLastUsed >= 1) {\n      await strapi.db.query('admin::api-token').update({\n        where: { id: apiToken.id },\n        data: { lastUsedAt: currentDate },\n      });\n    }\n  } else {\n    // If lastUsedAt is not set, initialize it to the current date\n    await strapi.db.query('admin::api-token').update({\n      where: { id: apiToken.id },\n      data: { lastUsedAt: currentDate },\n    });\n  }\n\n  if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    const ability = await strapi.contentAPI.permissions.engine.generateAbility(\n      apiToken.permissions.map((action: any) => ({ action }))\n    );\n\n    return { authenticated: true, ability, credentials: apiToken };\n  }\n\n  return { authenticated: true, credentials: apiToken };\n};\n\n/**\n * Verify the token has the required abilities for the requested scope\n *\n *  @type {import('.').VerifyFunction}\n */\nexport const verify = (auth: any, config: any) => {\n  const { credentials: apiToken, ability } = auth;\n\n  if (!apiToken) {\n    throw new UnauthorizedError('Token not found');\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      throw new UnauthorizedError('Token expired');\n    }\n  }\n\n  // Full access\n  if (apiToken.type === constants.API_TOKEN_TYPE.FULL_ACCESS) {\n    return;\n  }\n\n  // Read only\n  if (apiToken.type === constants.API_TOKEN_TYPE.READ_ONLY) {\n    /**\n     * If you don't have `full-access` you can only access `find` and `findOne`\n     * scopes. If the route has no scope, then you can't get access to it.\n     */\n    const scopes = castArray(config.scope);\n\n    if (config.scope && scopes.every(isReadScope)) {\n      return;\n    }\n  }\n\n  // Custom\n  else if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    if (!ability) {\n      throw new ForbiddenError();\n    }\n\n    const scopes = castArray(config.scope);\n\n    const isAllowed = scopes.every((scope) => ability.can(scope));\n\n    if (isAllowed) {\n      return;\n    }\n  }\n\n  throw new ForbiddenError();\n};\n\nexport const name = 'api-token';\n\nexport default {\n  name: 'api-token',\n  authenticate,\n  verify,\n};\n"],"names":["UnauthorizedError","ForbiddenError","errors","isReadScope","scope","endsWith","extractToken","ctx","request","header","authorization","parts","split","toLowerCase","length","authenticate","apiTokenService","getService","token","authenticated","apiToken","getBy","accessKey","hash","currentDate","Date","isNil","expiresAt","expirationDate","error","lastUsedAt","hoursSinceLastUsed","differenceInHours","parseISO","strapi","db","query","update","where","id","data","type","constants","API_TOKEN_TYPE","CUSTOM","ability","contentAPI","permissions","engine","generateAbility","map","action","credentials","verify","auth","config","FULL_ACCESS","READ_ONLY","scopes","castArray","every","isAllowed","can","name"],"mappings":"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"}

package/dist/server/server/src/strategies/api-token.mjs

@@ -47,10 +47,21 @@ const extractToken = (ctx)=>{
             };
         }
     }
-    // update lastUsedAt if the token has not been used in the last hour
-    // @ts-expect-error - FIXME: verify lastUsedAt is defined
-    const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));
-    if (hoursSinceLastUsed >= 1) {
+    if (!isNil(apiToken.lastUsedAt)) {
+        // update lastUsedAt if the token has not been used in the last hour
+        const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));
+        if (hoursSinceLastUsed >= 1) {
+            await strapi.db.query('admin::api-token').update({
+                where: {
+                    id: apiToken.id
+                },
+                data: {
+                    lastUsedAt: currentDate
+                }
+            });
+        }
+    } else {
+        // If lastUsedAt is not set, initialize it to the current date
         await strapi.db.query('admin::api-token').update({
             where: {
                 id: apiToken.id

package/dist/server/server/src/strategies/api-token.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"api-token.mjs","sources":["../../../../../server/src/strategies/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\nimport { castArray, isNil } from 'lodash/fp';\nimport { differenceInHours, parseISO } from 'date-fns';\nimport { errors } from '@strapi/utils';\nimport constants from '../services/constants';\nimport { getService } from '../utils';\nimport '@strapi/types';\n\nconst { UnauthorizedError, ForbiddenError } = errors;\n\nconst isReadScope = (scope: any) => scope.endsWith('find') || scope.endsWith('findOne');\n\nconst extractToken = (ctx: Context) => {\n  if (ctx.request && ctx.request.header && ctx.request.header.authorization) {\n    const parts = ctx.request.header.authorization.split(/\\s+/);\n\n    if (parts[0].toLowerCase() !== 'bearer' || parts.length !== 2) {\n      return null;\n    }\n\n    return parts[1];\n  }\n\n  return null;\n};\n\n/**\n * Authenticate the validity of the token\n */\nexport const authenticate = async (ctx: Context) => {\n  const apiTokenService = getService('api-token');\n  const token = extractToken(ctx);\n\n  if (!token) {\n    return { authenticated: false };\n  }\n\n  const apiToken = await apiTokenService.getBy({\n    accessKey: apiTokenService.hash(token),\n  });\n\n  // token not found\n  if (!apiToken) {\n    return { authenticated: false };\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      return { authenticated: false, error: new UnauthorizedError('Token expired') };\n    }\n  }\n\n  // update lastUsedAt if the token has not been used in the last hour\n  // @ts-expect-error - FIXME: verify lastUsedAt is defined\n  const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));\n  if (hoursSinceLastUsed >= 1) {\n    await strapi.db.query('admin::api-token').update({\n      where: { id: apiToken.id },\n      data: { lastUsedAt: currentDate },\n    });\n  }\n\n  if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    const ability = await strapi.contentAPI.permissions.engine.generateAbility(\n      apiToken.permissions.map((action: any) => ({ action }))\n    );\n\n    return { authenticated: true, ability, credentials: apiToken };\n  }\n\n  return { authenticated: true, credentials: apiToken };\n};\n\n/**\n * Verify the token has the required abilities for the requested scope\n *\n *  @type {import('.').VerifyFunction}\n */\nexport const verify = (auth: any, config: any) => {\n  const { credentials: apiToken, ability } = auth;\n\n  if (!apiToken) {\n    throw new UnauthorizedError('Token not found');\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      throw new UnauthorizedError('Token expired');\n    }\n  }\n\n  // Full access\n  if (apiToken.type === constants.API_TOKEN_TYPE.FULL_ACCESS) {\n    return;\n  }\n\n  // Read only\n  if (apiToken.type === constants.API_TOKEN_TYPE.READ_ONLY) {\n    /**\n     * If you don't have `full-access` you can only access `find` and `findOne`\n     * scopes. If the route has no scope, then you can't get access to it.\n     */\n    const scopes = castArray(config.scope);\n\n    if (config.scope && scopes.every(isReadScope)) {\n      return;\n    }\n  }\n\n  // Custom\n  else if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    if (!ability) {\n      throw new ForbiddenError();\n    }\n\n    const scopes = castArray(config.scope);\n\n    const isAllowed = scopes.every((scope) => ability.can(scope));\n\n    if (isAllowed) {\n      return;\n    }\n  }\n\n  throw new ForbiddenError();\n};\n\nexport const name = 'api-token';\n\nexport default {\n  name: 'api-token',\n  authenticate,\n  verify,\n};\n"],"names":["UnauthorizedError","ForbiddenError","errors","isReadScope","scope","endsWith","extractToken","ctx","request","header","authorization","parts","split","toLowerCase","length","authenticate","apiTokenService","getService","token","authenticated","apiToken","getBy","accessKey","hash","currentDate","Date","isNil","expiresAt","expirationDate","error","hoursSinceLastUsed","differenceInHours","parseISO","lastUsedAt","strapi","db","query","update","where","id","data","type","constants","API_TOKEN_TYPE","CUSTOM","ability","contentAPI","permissions","engine","generateAbility","map","action","credentials","verify","auth","config","FULL_ACCESS","READ_ONLY","scopes","castArray","every","isAllowed","can","name"],"mappings":"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"}
+{"version":3,"file":"api-token.mjs","sources":["../../../../../server/src/strategies/api-token.ts"],"sourcesContent":["import type { Context } from 'koa';\nimport { castArray, isNil } from 'lodash/fp';\nimport { differenceInHours, parseISO } from 'date-fns';\nimport { errors } from '@strapi/utils';\nimport constants from '../services/constants';\nimport { getService } from '../utils';\nimport '@strapi/types';\n\nconst { UnauthorizedError, ForbiddenError } = errors;\n\nconst isReadScope = (scope: any) => scope.endsWith('find') || scope.endsWith('findOne');\n\nconst extractToken = (ctx: Context) => {\n  if (ctx.request && ctx.request.header && ctx.request.header.authorization) {\n    const parts = ctx.request.header.authorization.split(/\\s+/);\n\n    if (parts[0].toLowerCase() !== 'bearer' || parts.length !== 2) {\n      return null;\n    }\n\n    return parts[1];\n  }\n\n  return null;\n};\n\n/**\n * Authenticate the validity of the token\n */\nexport const authenticate = async (ctx: Context) => {\n  const apiTokenService = getService('api-token');\n  const token = extractToken(ctx);\n\n  if (!token) {\n    return { authenticated: false };\n  }\n\n  const apiToken = await apiTokenService.getBy({\n    accessKey: apiTokenService.hash(token),\n  });\n\n  // token not found\n  if (!apiToken) {\n    return { authenticated: false };\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      return { authenticated: false, error: new UnauthorizedError('Token expired') };\n    }\n  }\n\n  if (!isNil(apiToken.lastUsedAt)) {\n    // update lastUsedAt if the token has not been used in the last hour\n    const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));\n    if (hoursSinceLastUsed >= 1) {\n      await strapi.db.query('admin::api-token').update({\n        where: { id: apiToken.id },\n        data: { lastUsedAt: currentDate },\n      });\n    }\n  } else {\n    // If lastUsedAt is not set, initialize it to the current date\n    await strapi.db.query('admin::api-token').update({\n      where: { id: apiToken.id },\n      data: { lastUsedAt: currentDate },\n    });\n  }\n\n  if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    const ability = await strapi.contentAPI.permissions.engine.generateAbility(\n      apiToken.permissions.map((action: any) => ({ action }))\n    );\n\n    return { authenticated: true, ability, credentials: apiToken };\n  }\n\n  return { authenticated: true, credentials: apiToken };\n};\n\n/**\n * Verify the token has the required abilities for the requested scope\n *\n *  @type {import('.').VerifyFunction}\n */\nexport const verify = (auth: any, config: any) => {\n  const { credentials: apiToken, ability } = auth;\n\n  if (!apiToken) {\n    throw new UnauthorizedError('Token not found');\n  }\n\n  const currentDate = new Date();\n\n  if (!isNil(apiToken.expiresAt)) {\n    const expirationDate = new Date(apiToken.expiresAt);\n    // token has expired\n    if (expirationDate < currentDate) {\n      throw new UnauthorizedError('Token expired');\n    }\n  }\n\n  // Full access\n  if (apiToken.type === constants.API_TOKEN_TYPE.FULL_ACCESS) {\n    return;\n  }\n\n  // Read only\n  if (apiToken.type === constants.API_TOKEN_TYPE.READ_ONLY) {\n    /**\n     * If you don't have `full-access` you can only access `find` and `findOne`\n     * scopes. If the route has no scope, then you can't get access to it.\n     */\n    const scopes = castArray(config.scope);\n\n    if (config.scope && scopes.every(isReadScope)) {\n      return;\n    }\n  }\n\n  // Custom\n  else if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {\n    if (!ability) {\n      throw new ForbiddenError();\n    }\n\n    const scopes = castArray(config.scope);\n\n    const isAllowed = scopes.every((scope) => ability.can(scope));\n\n    if (isAllowed) {\n      return;\n    }\n  }\n\n  throw new ForbiddenError();\n};\n\nexport const name = 'api-token';\n\nexport default {\n  name: 'api-token',\n  authenticate,\n  verify,\n};\n"],"names":["UnauthorizedError","ForbiddenError","errors","isReadScope","scope","endsWith","extractToken","ctx","request","header","authorization","parts","split","toLowerCase","length","authenticate","apiTokenService","getService","token","authenticated","apiToken","getBy","accessKey","hash","currentDate","Date","isNil","expiresAt","expirationDate","error","lastUsedAt","hoursSinceLastUsed","differenceInHours","parseISO","strapi","db","query","update","where","id","data","type","constants","API_TOKEN_TYPE","CUSTOM","ability","contentAPI","permissions","engine","generateAbility","map","action","credentials","verify","auth","config","FULL_ACCESS","READ_ONLY","scopes","castArray","every","isAllowed","can","name"],"mappings":"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"}

package/dist/server/src/services/guided-tour.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guided-tour.d.ts","sourceRoot":"","sources":["../../../../server/src/services/guided-tour.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAY,MAAM,eAAe,CAAC;AAG/C,MAAM,MAAM,yBAAyB,GAAG;IACtC,0BAA0B,EAAE,OAAO,CAAC;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,0BAA0B,GAAG,MAAM,yBAAyB,CAAC;AAEzE,eAAO,MAAM,uBAAuB,eAAgB;IAAE,MAAM,EAAE,KAAK,MAAM,CAAA;CAAE;;CA6C1E,CAAC"}
+{"version":3,"file":"guided-tour.d.ts","sourceRoot":"","sources":["../../../../server/src/services/guided-tour.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAY,MAAM,eAAe,CAAC;AAG/C,MAAM,MAAM,yBAAyB,GAAG;IACtC,0BAA0B,EAAE,OAAO,CAAC;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,0BAA0B,GAAG,MAAM,yBAAyB,CAAC;AAYzE,eAAO,MAAM,uBAAuB,eAAgB;IAAE,MAAM,EAAE,KAAK,MAAM,CAAA;CAAE;;CAwD1E,CAAC"}

package/dist/server/src/strategies/api-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-token.d.ts","sourceRoot":"","sources":["../../../../server/src/strategies/api-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,OAAO,eAAe,CAAC;AAoBvB;;GAEG;AACH,eAAO,MAAM,YAAY,QAAe,OAAO;;;;;;;;;;;;;;;;;;;;EA8C9C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,MAAM,SAAU,GAAG,UAAU,GAAG,SAmD5C,CAAC;AAEF,eAAO,MAAM,IAAI,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhC,wBAIE"}
+{"version":3,"file":"api-token.d.ts","sourceRoot":"","sources":["../../../../server/src/strategies/api-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,OAAO,eAAe,CAAC;AAoBvB;;GAEG;AACH,eAAO,MAAM,YAAY,QAAe,OAAO;;;;;;;;;;;;;;;;;;;;EAqD9C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,MAAM,SAAU,GAAG,UAAU,GAAG,SAmD5C,CAAC;AAEF,eAAO,MAAM,IAAI,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhC,wBAIE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "5.17.0",
+  "version": "5.18.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -84,12 +84,12 @@
     "@radix-ui/react-context": "1.0.1",
     "@radix-ui/react-toolbar": "1.0.4",
     "@reduxjs/toolkit": "1.9.7",
-    "@strapi/design-system": "2.0.0-rc.27",
-    "@strapi/icons": "2.0.0-rc.27",
-    "@strapi/permissions": "5.17.0",
-    "@strapi/types": "5.17.0",
-    "@strapi/typescript-utils": "5.17.0",
-    "@strapi/utils": "5.17.0",
+    "@strapi/design-system": "2.0.0-rc.28",
+    "@strapi/icons": "2.0.0-rc.28",
+    "@strapi/permissions": "5.18.0",
+    "@strapi/types": "5.18.0",
+    "@strapi/typescript-utils": "5.18.0",
+    "@strapi/utils": "5.18.0",
     "@testing-library/dom": "10.1.0",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "14.5.2",
@@ -144,8 +144,8 @@
     "zod": "3.24.2"
   },
   "devDependencies": {
-    "@strapi/admin-test-utils": "5.17.0",
-    "@strapi/data-transfer": "5.17.0",
+    "@strapi/admin-test-utils": "5.18.0",
+    "@strapi/data-transfer": "5.18.0",
     "@types/codemirror5": "npm:@types/codemirror@^5.60.15",
     "@types/fs-extra": "11.0.4",
     "@types/invariant": "2.2.36",