feat: simple yandex support is implemented

Author: YuriUfimtsev

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/StatisticsController.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using HwProj.APIGateway.API.ExportServices;
@@ -9,6 +10,7 @@
 using HwProj.Models.Result;
 using HwProj.SolutionsService.Client;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 
 namespace HwProj.APIGateway.API.Controllers
 {

HwProj.APIGateway/HwProj.APIGateway.API/Startup.cs

@@ -3,6 +3,7 @@
 using Google.Apis.Services;
 using Google.Apis.Sheets.v4;
 using HwProj.APIGateway.API.ExportServices;
+using HwProj.APIGateway.API.Models;
 using HwProj.AuthService.Client;
 using HwProj.CoursesService.Client;
 using HwProj.NotificationsService.Client;
@@ -14,6 +15,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
 using HwProj.Utils.Authorization;
+using Microsoft.EntityFrameworkCore;
+
 
 namespace HwProj.APIGateway.API
 {
@@ -28,6 +31,7 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddCors();
             services.ConfigureHwProjServices("API Gateway");
 
             const string authenticationProviderKey = "GatewayKey";

hwproj.front/src/App.tsx

@@ -41,7 +41,7 @@ class App extends Component<AppProps, AppState> {
         this.state = {
             loggedIn: ApiSingleton.authService.isLoggedIn(),
             isLecturer: ApiSingleton.authService.isLecturer(),
-            newNotificationsCount: 0
+            newNotificationsCount: 0,
         };
     }
 
@@ -71,6 +71,52 @@ class App extends Component<AppProps, AppState> {
         this.props.history.push("/login");
     }
 
+    updatedLastViewedCourseId = (courseId : string) =>
+    {
+        sessionStorage.setItem("courseId", courseId)
+    }
+
+    getLastCourseId = () =>
+    {
+        const sessionStorageCourseId = sessionStorage.getItem("courseId");
+        return sessionStorageCourseId === null ? "-1" : sessionStorageCourseId;
+    }
+
+    getUserYandexToken = () =>
+    {
+        const linkWithConfirmationCode = window.location.href;
+        const regExp : RegExp = new RegExp("yandex\\?code=(.*)", "g");
+        const confirmationCode = regExp.exec(linkWithConfirmationCode)![1];
+        const fetchBody = `grant_type=authorization_code&code=${confirmationCode}&client_id=49a5c4e9d2744ff5b0161a017d1ecd05&client_secret=184c6646ff62417fa2e942a18023881a`;
+        interface ExchangeConfirmationCodeRequest {
+            access_token: string
+        }
+        fetch(`https://oauth.yandex.ru/token`, {
+            method: "post",
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded; Charset=utf-8',
+                'Host': 'https://oauth.yandex.ru/'
+            },
+            body: fetchBody
+        })
+            .then( async (response) => {
+                if (response.status === 200) {
+                    const jsonResponse = await response.json();
+                    const token = jsonResponse.access_token;
+                    const userId = await ApiSingleton.accountApi.apiAccountGetUserDataGet()
+                        .then((data) => {
+                            const userData = data.userData;
+                            if (userData !== undefined) {
+                                return userData.userId
+                            }
+                        })
+                    if (token !== null && userId !== undefined)
+                    {
+                        localStorage.setItem(`yandexAccessToken=${userId}`, token);
+                    }
+                }
+            });
+    }
 
     render() {
         return (
@@ -88,7 +134,15 @@ class App extends Component<AppProps, AppState> {
                     <Route exact path="/courses" component={Courses}/>
                     <Route exact path="/profile/:id" component={Workspace}/>
                     <Route exact path="/create_course" component={CreateCourse}/>
-                    <Route exact path="/courses/:id" component={Course}/>
+                    <Route exact path="/courses/:id"
+                           render={(props) =>
+                               <Course
+                                   {...props}
+                                   id={props.match.params.id}
+                                   onSet={this.updatedLastViewedCourseId}
+                                   isFromRedirect={false}
+                                   redirectHandler={this.getUserYandexToken}
+                               />}/>
                     <Route exact path="/courses/:courseId/edit" component={EditCourse}/>
                     <Route exact path="/homework/:homeworkId/edit" component={EditHomework}/>
                     <Route exact path="/task/:taskId/edit" component={EditTask}/>
@@ -104,6 +158,17 @@ class App extends Component<AppProps, AppState> {
                         path="/register"
                         render={(props) => <Register {...props} onLogin={this.login}/>}
                     />
+                    <Route
+                        exact
+                        path="/yandex"
+                        render={(props) => <Course
+                            {...props}
+                            id={this.getLastCourseId()}
+                            onSet={this.updatedLastViewedCourseId}
+                            isFromRedirect={true}
+                            redirectHandler={this.getUserYandexToken}
+                        />}
+                    />
                     <Route exact path={"*"} component={WrongPath}/>
                 </Switch>
             </>

hwproj.front/src/components/Courses/Course.tsx

@@ -32,6 +32,9 @@ interface ICourseState {
 
 interface ICourseProps {
     id: string;
+    onSet: (courseId: string) => void;
+    isFromRedirect: boolean;
+    redirectHandler: () => void;
 }
 
 const styles = makeStyles(() => ({
@@ -41,8 +44,8 @@ const styles = makeStyles(() => ({
     },
 }))
 
-const Course: React.FC<RouteComponentProps<ICourseProps>> = (props) => {
-    const courseId = props.match.params.id
+const Course: React.FC<ICourseProps> = (props) => {
+    const courseId = props.id
     const classes = styles()
 
     const [courseState, setCourseState] = useState<ICourseState>({
@@ -76,7 +79,12 @@ const Course: React.FC<RouteComponentProps<ICourseProps>> = (props) => {
     }
 
     useEffect(() => {
-        setCurrentState()
+        setCurrentState();
+        props.onSet(courseId);
+        if (props.isFromRedirect)
+        {
+            props.redirectHandler();
+        }
     }, [])
 
     const joinCourse = async () => {

hwproj.front/src/components/Courses/StudentStats.tsx

@@ -3,7 +3,7 @@ import {CourseViewModel, HomeworkViewModel, StatisticsCourseMatesModel} from "..
 import {Table, TableBody, TableCell, TableContainer, TableHead, TableRow} from "@material-ui/core";
 import StudentStatsCell from "../Tasks/StudentStatsCell";
 import {Alert, Grid} from "@mui/material";
-import LoadStatsToGoogleDoc from "components/Solutions/LoadStatsToGoogleDoc";
+import SaveStats from "components/Solutions/SaveStats";
 
 interface IStudentStatsProps {
     course: CourseViewModel;
@@ -97,7 +97,7 @@ class StudentStats extends React.Component<IStudentStatsProps, IStudentStatsStat
                     </Table>
                 </TableContainer>
                 <div style={{marginTop: 15}}>
-                    <LoadStatsToGoogleDoc
+                    <SaveStats
                         courseId={this.props.course.id}
                         userId={this.props.userId}
                     />

hwproj.front/src/components/Solutions/DownloadStats.tsx

@@ -0,0 +1,67 @@
+import React, { FC, useState } from "react";
+import { ResultString } from "../../api";
+import { Alert, Box, Button, CircularProgress, Grid, MenuItem, Select, TextField } from "@mui/material";
+import apiSingleton from "../../api/ApiSingleton";
+
+interface DownloadStatsProps {
+    courseId: number | undefined
+    userId: string
+    onCancellation: () => void
+}
+
+interface DownloadStatsState {
+    fileName: string,
+}
+
+const DownloadStats: FC<DownloadStatsProps> = (props: DownloadStatsProps) => {
+    const [state, setState] = useState<DownloadStatsState>({
+        fileName: "",
+    })
+
+    const { fileName } = state
+
+    const handleFileDownloading = (promise : Promise<Response>, fileName: string) => {
+        promise.then((response) => response.blob())
+            .then((blob) => {
+                const url = window.URL.createObjectURL(new Blob([blob]));
+                const link = document.createElement('a');
+                link.href = url;
+                link.setAttribute('download', `${fileName}.xlsx`);
+                document.body.appendChild(link);
+                link.click();
+                link.parentNode!.removeChild(link);
+            })
+    }
+
+    return <Grid container spacing={1} style={{ marginTop: 15 }}>
+        <Grid container item spacing={1} alignItems={"center"}>
+            <Grid item xs={5}>
+                <TextField size={"small"} fullWidth label={"Название файла"} value={fileName}
+                           onChange={event => {
+                               event.persist();
+                               setState({fileName: event.target.value});
+                           }} />
+            </Grid>
+            <Grid item>
+                <Box sx={{ m: 1, position: 'relative' }}>
+                    <Button variant="text" color="primary" type="button"
+                            onClick={() => {
+                                const fileData = apiSingleton.statisticsApi.apiStatisticsGetFileGet(
+                                    props.courseId, props.userId, "Лист 1"
+                                );
+                                handleFileDownloading(fileData, fileName);
+                            }}>
+                        Загрузить
+                    </Button>
+                </Box>
+            </Grid>
+            <Grid item>
+                <Button variant="text" color="primary" type="button"
+                        onClick={props.onCancellation}>
+                    Отмена
+                </Button>
+            </Grid>
+        </Grid>
+    </Grid>
+}
+export default DownloadStats;

hwproj.front/src/components/Solutions/ExportStats.tsx

@@ -0,0 +1,99 @@
+import React, {FC, FunctionComponent, FunctionComponentElement, useState} from "react";
+import { ResultString } from "../../api";
+import { ResultExternalService } from "../../api";
+import { Alert, Box, Button, CircularProgress, Grid, MenuItem, Select, TextField } from "@mui/material";
+import apiSingleton from "../../api/ApiSingleton";
+import ExportToGoogle from "components/Solutions/ExportToGoogle";
+import ExportToYandex from "components/Solutions/ExportToYandex";
+
+interface ExportStatsProps {
+    courseId: number | undefined
+    userId: string
+    onCancellation: () => void
+}
+
+interface ExportStatsState {
+    url: string,
+    googleSheetTitles: ResultString | undefined,
+    selectedSheet: number
+    selectedService: ResultExternalService.ValueEnum | undefined
+}
+
+const ExportStats: FC<ExportStatsProps> = (props: ExportStatsProps) => {
+    const [state, setState] = useState<ExportStatsState>({
+        selectedSheet: 0,
+        url: "",
+        googleSheetTitles: undefined,
+        selectedService: undefined
+    })
+
+    const { url, googleSheetTitles, selectedSheet, selectedService } = state
+
+    const servicesComponents = new Map<ResultExternalService.ValueEnum, FunctionComponentElement<any>>([
+        [ResultExternalService.ValueEnum.NUMBER_0,
+            <ExportToGoogle
+                courseId={props.courseId}
+                userId={props.userId}
+                url={url}
+                onUrlChange={(value: string) => handleUrlChange(value)}
+                onCancellation={() => props.onCancellation()}
+            />],
+        [ResultExternalService.ValueEnum.NUMBER_1,
+            <ExportToYandex
+                courseId={props.courseId}
+                userId={props.userId}
+                url={url}
+                onUrlChange={(value: string) => handleUrlChange(value)}
+                onCancellation={() => props.onCancellation()}
+            />],
+    ]);
+
+    const handleUrlChange = async (value: string) => {
+        const service = await apiSingleton.statisticsApi.apiStatisticsProcessLinkPost(value);
+        setState(prevState => ({ ...prevState, url: value, selectedService: service.succeeded ? service.value : undefined }));
+    }
+
+    const getSelectedServiceComponent = () => {
+        if (selectedService === undefined || !servicesComponents.has(selectedService))
+        {
+            return (
+                <Grid container spacing={1} style={{ marginTop: 15 }}>
+                    <Grid item>
+                        {(url &&
+                            <Alert severity="error">
+                                Сервис не распознан. Поддерживаемые сервисы: Google Docs, Yandex
+                            </Alert>)
+                            ||
+                        <Alert severity="info" variant={"standard"}>
+                            Поддерживаемые сервисы: Google Docs, Яндекс Диск
+                        </Alert>}
+                    </Grid>
+                    <Grid container item spacing={1} xs={12} alignItems={"center"}>
+                        <Grid item xs={5}>
+                            <TextField fullWidth size={"small"} label={"Ссылка на сервис"} value={url}
+                                       onChange={event => {
+                                           const newUrl = event.target.value
+                                           handleUrlChange(newUrl)
+                                       }} />
+                        </Grid>
+                        <Grid item>
+                            <Button variant="text" color="primary" type="button"
+                                    onClick={props.onCancellation}>
+                                Отмена
+                            </Button>
+                        </Grid>
+                    </Grid>
+                </Grid>
+            )
+        }
+
+        return servicesComponents.get(selectedService);
+    }
+
+    return (
+        <div>
+            {getSelectedServiceComponent()}
+        </div>
+    )
+}
+export default ExportStats;