moved auth api request to backend + frontend cleanup

Author: malgamves

admin/src/components/Input/index.js

@@ -2,10 +2,9 @@ import React, { useState } from 'react';
 import { useIntl } from 'react-intl';
 import { TextInput } from '@strapi/design-system/TextInput';
 import { Stack } from '@strapi/design-system/Stack';
-import { Box } from '@strapi/design-system/Box';
 import { Button } from '@strapi/design-system/Button';
 import { Textarea } from '@strapi/design-system';
-import { TwoColsLayout } from '@strapi/design-system';
+import { auth } from '@strapi/helper-plugin'
 
 
 export default function Index({
@@ -18,17 +17,16 @@ export default function Index({
   attribute,
 }) {
   const { formatMessage } = useIntl();
-  const [content, setContent] = useState('');
   const [prompt, setPrompt] = useState('');
   const [err, setErr] = useState(''); 
 
-  const aiClick = async () => {
+  const generateText = async () => {
     try {
-      const response = await fetch('https://api.openai.com/v1/completions', {
+      const response = await fetch(`/ai-text-generation/generate-text`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
-          'Authorization': `Bearer ${accessToken}` //functionality to be added
+          'Authorization': `Bearer ${auth.getToken()}` 
         },
         body: JSON.stringify({
           'model': 'text-davinci-001',
@@ -46,7 +44,9 @@ export default function Index({
       }
 
       const result = await response.json();
-      onChange({ target: { name, value: result.choices[0].text, type: attribute.type } })
+      const parsedResult = result.choices[0].text.replace(/(?:\r\n|\r|\n)/g, '');
+
+      onChange({ target: { name, value: parsedResult, type: attribute.type } })
     } catch (err) {
       setErr(err.message);
     }
@@ -80,7 +80,7 @@ export default function Index({
           {value}
         </Textarea>
         <Stack horizontal spacing={4}>
-          <Button onClick={aiClick}>Generate</Button>
+          <Button onClick={() => generateText()}>Generate</Button>
           <Button onClick={() => clearGeneratedText()}>Clear</Button>
         </Stack>
       </Stack>

admin/src/index.js

@@ -48,7 +48,7 @@ export default {
         id: "ai-text-generation.text-ai.description",
         defaultMessage: "Let AI do your writing!",
       },
-      icon: AITextIcon, // don't forget to create/import your icon component 
+      icon: PluginIcon, // don't forget to create/import your icon component 
       components: {
         Input: async () => import(/* webpackChunkName: "input-component" */ "./components/Input"),
       },

server/controllers/my-controller.js renamed to server/controllers/ai-controller.js

@@ -4,7 +4,7 @@ module.exports = ({ strapi }) => ({
   async generate(ctx) {
     ctx.body = await strapi
       .plugin('ai-text-generation')
-      .service('myService')
-      .generate(ctx.request.body.prompt);
+      .service('openAi')
+      .generateText(ctx.request.body.prompt);
   },
 });

server/controllers/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const myController = require('./my-controller');
+const aiController = require('./ai-controller');
 
 module.exports = {
-  myController,
+  aiController,
 };

server/routes/index.js

@@ -1,8 +1,8 @@
 module.exports = [
   {
     method: 'POST',
-    path: '/generate',
-    handler: 'myController.generate',
+    path: '/generate-text',
+    handler: 'aiController.generate',
     config: {
       policies: [],
     },

server/services/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const myService = require('./my-service');
+const openAi = require('./open-ai');
 
 module.exports = {
-  myService,
+  openAi,
 };

server/services/my-service.js renamed to server/services/open-ai.js

@@ -2,21 +2,17 @@
 
 const axios = require('axios');
 
-
 module.exports = ({ strapi }) => ({
-  getWelcomeMessage() {
-    return 'Welcome to Strapi 🚀';
-  },
 
-  async generate(prompt) {
+  async generateText(prompt) {
     try {
       const response = await axios(
         {
           url: 'https://api.openai.com/v1/completions',
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
-            'Authorization': `Bearer ${strapi.plugin('ai-text-generation').config('accessToken')}` //functionality to be added
+            'Authorization': `Bearer ${strapi.plugin('ai-text-generation').config('apiToken')}`
           },
           data: JSON.stringify({
             'model': 'text-davinci-001',
@@ -29,15 +25,14 @@ module.exports = ({ strapi }) => ({
           })
         })
 
-      
+
       const result = await response.data;
-      console.log('response:', response.data)
-    return result;
-  }
-    catch (err){ 
+      return result;
+    }
+    catch (err) {
       console.log(err.response)
     }
 
-}
-  
+  }
+
 });