Merge pull request #169 from oluademola/tenant-tokenv0.30

update tenant token demo to v0.30

Author: oluademola

src/tenant-token/README.md

@@ -42,19 +42,19 @@ See our [Documentation](https://docs.meilisearch.com/learn/security/tenant_token
 
 ## 🎁 Content of this repository
 In this repository, you will find three sub directories:
-  1. **Frontend** - React App to search,create token and switch between tokens.
+  1. **Frontend** - React App to search, create token and switch between tokens.
   2. **Backend** - Express App to handle Apis.
   3. **Seed** - Script to feed intial data in meilisearch.
 
 ## 🎬 Getting Started
 
->Prerequisite: Start Docker and download latest Meilisearch docker image using the command `docker pull getmeili/meilisearch:latest` before going further.
+>Prerequisite: Start Docker and download latest Meilisearch docker image using the command `docker pull getmeili/meilisearch:v0.30.4` before going further.
 
 ### 1. Seed Data
 
 Navigate to `/seed` and create a **.env** file with content
 ```
-MEILI_API_KEY=<PUT_YOUR_API_KEY_HERE>
+MEILI_MASTER_KEY=<PUT_YOUR_MASTER_KEY_HERE>
 ```
 Then run `npm run meilisearch-serve`  to start meilisearch on docker.
 
@@ -68,11 +68,11 @@ npm start
 
 ## 2. Backend
 
-Navigate to `/backend` and create a **.env** file with content
+Navigate to `/backend` and create a **.env** file with content.
 
 ```
 MEILI_HOST=http://localhost:7700
-MEILI_API_KEY=<PUT_YOUR_API_KEY_HERE>
+MEILI_ADMIN_API_KEY=<PUT_YOUR_ADMIN_API_KEY_HERE>
 ```
 Run the following commands:
 
@@ -81,17 +81,17 @@ npm i
 npm start
 ```
 
-This will start your express server on [http://localhost:5000](http://localhost:5000)
+This will start your express server on [http://localhost:5001](http://localhost:5000)
 
 ## 3. Frontend
 
 Navigate to `/frontend` and create a **.env** file with content
 
 ```
 REACT_APP_MEILI_HOST=http://localhost:7700
-REACT_APP_MEILI_API_KEY=<PUT_YOUR_API_KEY_HERE>
+REACT_APP_MEILI_SEARCH_API_KEY=<PUT_YOUR_SEARCH_API_KEY_HERE>
 REACT_APP_MEILI_INDEX=tenant_token
-REACT_APP_API_HOST=http://localhost:5000
+REACT_APP_API_HOST=http://localhost:5001
 ```
 
 Run the following commands:

src/tenant-token/backend/.env.example

@@ -1,2 +1,2 @@
-MEILI_HOST=
-MEILI_API_KEY=
+MEILI_HOST=http://localhost:7700
+MEILI_ADMIN_API_KEY=<PUT_YOUR_ADMIN_API_KEY_HERE>

src/tenant-token/backend/index.js

@@ -6,7 +6,7 @@ const app = express();
 
 const client = new MeiliSearch({
   host: process.env.MEILI_HOST || "http://localhost:7700",
-  apiKey: process.env.MEILI_API_KEY || "masterKey",
+  apiKey: process.env.MEILI_ADMIN_API_KEY,
 });
 
 app.use(cors());
@@ -21,7 +21,8 @@ app.get("/create-tenant-token", async (req, res) => {
   /* Replace this comment with the API request */
 
   const { results } = await client.getKeys();
-  const apiKey = results[0].key;
+  const apiKey = results.filter((res) => res.name === "Default Search API Key")[0].key;
+  const apiKeyUid = results.filter((res) => res.name === "Default Search API Key")[0].uid;
 
   const payload = {
     tenant_token: {
@@ -33,29 +34,15 @@ app.get("/create-tenant-token", async (req, res) => {
     new Date().setFullYear(new Date().getFullYear() + 1)
   );
 
-  const tenantToken = client.generateTenantToken(payload, {
+  const tenantToken = client.generateTenantToken(apiKeyUid, payload, {
     apiKey,
     expiresAt,
   });
   return res.json({ token: tenantToken });
 });
 
-const port = process.env.PORT || 5000;
+const port = process.env.PORT || 5001;
 
 app.listen(port, async () => {
-  console.log("Checking for an API Key");
-  const { results } = await client.getKeys();
-  const apiKeyList = results.filter((res) => res.description === "SEARCH");
-
-  if (apiKeyList.length === 0) {
-    await client.createKey({
-      description: "SEARCH",
-      actions: ["search"],
-      indexes: ["tenant_token"],
-      expiresAt: "2025-01-01T00:00:00Z",
-    });
-    console.log("Created API Key");
-  }
-
   console.log(`Server started at PORT: ${port}`);
 });

src/tenant-token/backend/package-lock.json

@@ -7,7 +7,7 @@
     "cors": "^2.8.5",
     "dotenv": "^16.0.0",
     "express": "^4.17.3",
-    "meilisearch": "^0.25.0"
+    "meilisearch": "^0.30.0"
   },
   "scripts": {
     "start": "node index.js",

src/tenant-token/backend/package.json

@@ -1,4 +1,4 @@
 REACT_APP_MEILI_HOST=http://localhost:7700
-REACT_APP_MEILI_API_KEY=<PUT_YOUR_API_KEY_HERE>
+REACT_APP_MEILI_SEARCH_API_KEY=<PUT_YOUR_SEARCH_API_KEY_HERE>
 REACT_APP_MEILI_INDEX=tenant_token
-REACT_APP_API_HOST=http://localhost:5000
+REACT_APP_API_HOST=http://localhost:5001