Merge branch 'dev'

Author: felippegh

admin/src/components/DynamicTable/FirebaseTableRows/FirebaseTableRows.tsx

@@ -11,6 +11,7 @@ import { CarretDown } from "@strapi/icons";
 import { RxCross2, RxCheck } from "react-icons/rx";
 import { Typography } from "@strapi/design-system";
 import styled from "styled-components";
+import { format } from "date-fns";
 import { MapProviderToIcon } from "../../../utils/provider";
 import { User } from "../../../../../model/User";
 
@@ -141,6 +142,22 @@ export const FirebaseTableRows = ({
               <Td key={data.disabled}>
                 {data.disabled ? <RxCheck size={24} /> : <RxCross2 size={24} />}
               </Td>
+              <Td key={data.createdAt}>
+                <TypographyMaxWidth ellipsis textColor="neutral800">
+                  {data.createdAt
+                    ? format(new Date(data.createdAt), "yyyy/MM/dd kk:mm")
+                    : data.metadata?.creationTime
+                    ? format(new Date(data.metadata.creationTime), "yyyy/MM/dd kk:mm")
+                    : '-'}
+                </TypographyMaxWidth>
+              </Td>
+              <Td key={data.lastSignInTime}>
+                <TypographyMaxWidth ellipsis textColor="neutral800">
+                  {data.metadata?.lastSignInTime
+                    ? format(new Date(data.metadata.lastSignInTime), "yyyy/MM/dd kk:mm")
+                    : '-'}
+                </TypographyMaxWidth>
+              </Td>
               <Flex alignItems="center" paddingTop={3} gap={4}>
                 <Box key={data.uid}>
                   <SimpleMenu

admin/src/components/DynamicTable/TableHeaders.ts

@@ -116,4 +116,30 @@ export const tableHeaders = [
     },
     key: "__disabled_key__",
   },
+  {
+    name: "createdAt",
+    fieldSchema: {
+      configurable: false,
+      type: "string",
+    },
+    metadatas: {
+      label: "Created At",
+      sortable: true,
+      searchable: false,
+    },
+    key: "__createdAt_key__",
+  },
+  {
+    name: "lastSignInTime",
+    fieldSchema: {
+      configurable: false,
+      type: "string",
+    },
+    metadatas: {
+      label: "Last Sign In",
+      sortable: true,
+      searchable: false,
+    },
+    key: "__lastSignInTime_key__",
+  },
 ];

model/User.ts

@@ -24,6 +24,7 @@ export interface FirebaseUser {
   tokensValidAfterTime: string;
   phoneNumber: string;
   localUser?: StrapiUser;
+  lastSignInTime?: string; // Computed field for table display
 }
 
 export interface StrapiUser {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@swensonhe/strapi-plugin-firebase-auth",
-	"version": "1.0.15",
+	"version": "1.0.16",
 	"description": "This is a Strapi plugin connect and authenticate users using firebase",
 	"strapi": {
 		"name": "firebase-auth",

server/services/userService.ts

@@ -99,14 +99,31 @@ export default ({ strapi }) => ({
       const [sortField, sortOrder] = sort.split(':');
 
       sortedUsers = [...allUsers.users].sort((a, b) => {
-        const aValue = a[sortField];
-        const bValue = b[sortField];
+        let aValue = a[sortField];
+        let bValue = b[sortField];
+
+        // Special handling for createdAt and lastSignInTime - use Firebase metadata
+        if (sortField === 'createdAt') {
+          aValue = aValue || a.metadata?.creationTime;
+          bValue = bValue || b.metadata?.creationTime;
+        } else if (sortField === 'lastSignInTime') {
+          // For Last Sign In, only use Firebase metadata (no fallback to Strapi updatedAt)
+          aValue = a.metadata?.lastSignInTime;
+          bValue = b.metadata?.lastSignInTime;
+        }
 
         // Handle null/undefined values - push them to the end
         if (aValue == null && bValue == null) return 0;
         if (aValue == null) return 1;
         if (bValue == null) return -1;
 
+        // For date fields (createdAt, lastSignInTime), parse as dates
+        if (sortField === 'createdAt' || sortField === 'lastSignInTime') {
+          const aDate = new Date(aValue).getTime();
+          const bDate = new Date(bValue).getTime();
+          return sortOrder === 'DESC' ? bDate - aDate : aDate - bDate;
+        }
+
         // For numeric fields, use numeric comparison
         if (typeof aValue === 'number' && typeof bValue === 'number') {
           return sortOrder === 'DESC' ? bValue - aValue : aValue - bValue;