cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-08 08:53:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

improve get state check

Browse Source
This commit is contained in:
arc-alex
2023-12-13 18:56:49 +01:00
parent e52ff58d74
commit 884947374d
3 changed files with 110 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
+46 -34
View File
@@ -11,6 +11,7 @@ import {
ModalFooter,
ModalHeader,
ModalOverlay,
Select,
} from '@chakra-ui/react';
import { IoArrowDownCircleOutline } from '@react-icons/all-files/io5/IoArrowDownCircleOutline';
import { IoArrowUpCircleOutline } from '@react-icons/all-files/io5/IoArrowUpCircleOutline';
@@ -49,12 +50,18 @@ export default function SheetsModal(props: SheetsModalProps) {
const [userFields, setUserFields] = useState<UserFields | null>(null);
const [project, setProject] = useState<ProjectData | null>(null);
const [sheetState, setSheetState] = useState<GoogleSheetState>({ auth: false, id: false, worksheet: false });
const [sheetState, setSheetState] = useState<GoogleSheetState>({
secret: false,
auth: false,
id: false,
worksheet: false,
worksheetOptions: [],
});
const queryClient = useQueryClient();
const sheetid = useRef<HTMLInputElement>(null);
const worksheet = useRef<HTMLInputElement>(null);
const worksheet = useRef<HTMLSelectElement>(null);
const handleClose = () => {
setRundown(null);
@@ -82,14 +89,21 @@ export default function SheetsModal(props: SheetsModalProps) {
useEffect(() => {
getSheetSettings().then((data) => {
if (sheetid.current?.value != data.id || worksheet.current?.value != data.worksheet) {
if (data.id == '') {
return;
}
console.log(worksheet.current?.value);
if (
sheetid.current?.value != data.id ||
(worksheet.current?.value != data.worksheet && worksheet.current?.value)
) {
_onChange();
}
if (sheetid.current) {
sheetid.current.value = data.id;
}
if (worksheet.current) {
worksheet.current.value = data.worksheet;
if (sheetid.current) {
sheetid.current.value = data.id;
}
if (worksheet.current) {
worksheet.current.value = data.worksheet;
}
}
});
});
@@ -186,14 +200,20 @@ export default function SheetsModal(props: SheetsModalProps) {
data-testid='file-input'
/>
<div>Need to add some help here</div>
<br />
<div>
<Button onClick={handleClick}>Upload Client Secrect</Button>
{sheetState.secret ? 'have good secret' : 'no or bad secret'}
</div>
<Button variant='ontime-filled' padding='0 2em' onClick={handleAuthenticate}>
Authenticate
</Button>
{sheetState.auth ? <div>You are authenticated</div> : <div>You are not authenticated</div>}
<div>
<br />
<div style={sheetState.secret ? {} : { display: 'none' }}>
<Button variant='ontime-filled' padding='0 2em' onClick={handleAuthenticate}>
Authenticate
</Button>
{sheetState.auth ? 'You are authenticated' : 'You are not authenticated'}
</div>
<br />
<div style={sheetState.auth ? {} : { display: 'none' }}>
<label htmlFor='sheetid'>Sheet ID </label>
<InputGroup size='sm'>
<Input
@@ -208,28 +228,20 @@ export default function SheetsModal(props: SheetsModalProps) {
{sheetState.id ? <IoCheckmarkCircleOutline color='green' /> : <IoCloseCircleOutline color='red' />}
</InputRightAddon>
</InputGroup>
<br />
<label htmlFor='worksheet'>Worksheet </label>
<InputGroup size='sm'>
<Input
type='text'
ref={worksheet}
id='worksheet'
width='240px'
textAlign='right'
variant='ontime-filled-on-light'
/>
<InputRightAddon>
{sheetState.worksheet ? (
<IoCheckmarkCircleOutline color='green' />
) : (
<IoCloseCircleOutline color='red' />
)}
</InputRightAddon>
</InputGroup>
</div>
<br />
<div>
<div style={sheetState.id ? {} : { display: 'none' }}>
<label htmlFor='worksheet'>Worksheet </label>
<Select ref={worksheet} size='sm' id='worksheet'>
{sheetState.worksheetOptions.map((value) => (
<option key={value} value={value}>
{value}
</option>
))}
</Select>
</div>
<br />
<div style={sheetState.worksheet ? {} : { display: 'none' }}>
<Button
disabled={!sheetState.worksheet}
variant='ontime-subtle-on-light'
apps/server/src/utils/sheetsAuth.ts
+62 -26
View File
@@ -1,5 +1,6 @@
import { sheets, sheets_v4 } from '@googleapis/sheets';
import { readFile, writeFile } from 'fs/promises';
import { writeFile } from 'fs/promises';
import { readFileSync } from 'fs';
import { OAuth2Client } from 'google-auth-library';
import http from 'http';
import { DatabaseModel, GoogleSheetState, LogOrigin } from 'ontime-types';
@@ -20,8 +21,9 @@ type ResponseOK = {
class sheet {
private static client: null | OAuth2Client = null;
private readonly scope = 'https://www.googleapis.com/auth/spreadsheets';
private readonly sheetsFolder;
private readonly client_secret;
private readonly sheetsFolder: string;
private readonly clientSecretFile: string;
private static clientSecret = null;
private static authUrl: null | string = null;
private worksheetId = 0;
private sheetId = '';
@@ -33,40 +35,77 @@ class sheet {
throw new Error('Could not resolve public folder for platform');
}
this.sheetsFolder = join(appDataPath, 'sheets');
this.client_secret = join(this.sheetsFolder, 'client_secret.json');
this.clientSecretFile = join(this.sheetsFolder, 'client_secret.json');
ensureDirectory(this.sheetsFolder);
try {
sheet.clientSecret = JSON.parse(readFileSync(this.clientSecretFile, 'utf-8'));
} catch (_) {
/* empty - it is ok thet there is no clientSecret */
}
}
public async getSheetState(): Promise<GoogleSheetState> {
console.log('getSheetState');
const ret: GoogleSheetState = {
secret: false,
auth: false,
id: false,
worksheet: false,
worksheetOptions: [],
};
const lastID = this.sheetId;
this.sheetId = '';
this.worksheetId = 0;
if (!sheet.clientSecret) {
return ret;
}
ret.secret = true;
if (!sheet.client) {
return ret;
}
try {
ret.auth = await this.refreshToken();
if (ret.auth) {
const settings = DataProvider.getGoogleSheet();
const x = await this.exist(settings.id, settings.worksheet);
if (x === true) {
ret.id = true;
this.sheetId = settings.id;
} else if (x !== false) {
ret.id = true;
ret.worksheet = true;
this.sheetId = settings.id;
this.worksheetId = x.worksheetId;
this.range = x.range;
}
}
} catch (err) {
logger.error(LogOrigin.Server, `Google Sheet: Faild to refresh token ${err}`);
}
if (!ret.auth) {
return ret;
}
const settings = DataProvider.getGoogleSheet();
if (settings.id != '' && lastID != settings.id) {
const spreadsheets = await sheets({ version: 'v4', auth: sheet.client })
.spreadsheets.get({
spreadsheetId: settings.id,
includeGridData: false,
})
.catch((err) => {
logger.error(LogOrigin.Server, `Google Sheet: faild to load sheet ${err}`);
});
if (!spreadsheets || spreadsheets.status != 200) {
return ret;
}
ret.id = true;
ret.worksheetOptions = spreadsheets.data.sheets.map((i) => i.properties.title);
if (ret.worksheetOptions.indexOf(settings.worksheet) < 0) {
return ret;
}
ret.worksheet = true;
}
// const x = await this.exist(settings.id, settings.worksheet);
// if (x === true) {
// ret.id = true;
// this.sheetId = settings.id;
// } else if (x !== false) {
// ret.id = true;
// ret.worksheet = true;
// this.sheetId = settings.id;
// this.worksheetId = x.worksheetId;
// this.range = x.range;
// }
// }
return ret;
}
@@ -222,6 +261,7 @@ class sheet {
public async saveClientSecrets(secrets: object) {
sheet.client = null;
sheet.authUrl = null;
sheet.clientSecret = null;
if (
!('client_id' in secrets['installed']) ||
!('project_id' in secrets['installed']) ||
@@ -233,9 +273,10 @@ class sheet {
) {
throw new Error('Sheet slient secret is missing some keys');
}
await writeFile(this.client_secret, JSON.stringify(secrets), 'utf-8').catch((err) =>
await writeFile(this.clientSecretFile, JSON.stringify(secrets), 'utf-8').catch((err) =>
logger.error(LogOrigin.Server, `${err}`),
);
sheet.clientSecret = secrets;
}
/**
@@ -274,13 +315,8 @@ class sheet {
);
return sheet.authUrl;
}
const creadFile = await readFile(this.client_secret, 'utf-8').catch((err) =>
logger.error(LogOrigin.Server, `${err}`),
);
if (!creadFile) {
return null;
}
const keyFile = JSON.parse(creadFile);
const keyFile = sheet.clientSecret;
const keys = keyFile.installed || keyFile.web;
if (!keys.redirect_uris || keys.redirect_uris.length === 0) {
logger.error(LogOrigin.Server, `${invalidRedirectUri}`);
packages/types/src/definitions/core/GoogleSheet.type.ts
+2
View File
@@ -4,7 +4,9 @@ export type GoogleSheet = {
};
export type GoogleSheetState = {
secret: boolean;
auth: boolean;
id: boolean;
worksheet: boolean;
worksheetOptions: string[];
};