ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "pws:" prefix from PWS ID

Browse Source
This commit is contained in:
Matthew Oslan
2019-07-12 20:04:25 -04:00
parent 3038728d4a
commit 2992df9c33
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routes/adjustmentMethods/AdjustmentMethod.ts
View File

@@ -57,7 +57,7 @@ export interface AdjustmentMethodResponse {
} }
export interface AdjustmentOptions { export interface AdjustmentOptions {
/** The ID of the PWS to use, prefixed with "pws:". */ /** The ID of the PWS to use. */
pws?: string; pws?: string;
/** The API key to use to access PWS data. */ /** The API key to use to access PWS data. */
key?: string; key?: string;

4
routes/weather.ts
View File

@@ -221,8 +221,8 @@ export const getWateringData = async function( req: express.Request, res: expres
let pws: PWS | undefined = undefined; let pws: PWS | undefined = undefined;
if ( adjustmentOptions.pws && adjustmentOptions.key ) { if ( adjustmentOptions.pws && adjustmentOptions.key ) {
const idMatch = adjustmentOptions.pws.match( /^pws:([a-zA-Z\d]+)$/ ); const idMatch = adjustmentOptions.pws.match( /^[a-zA-Z\d]+$/ );
const pwsId = idMatch ? idMatch[ 1 ] : undefined; const pwsId = idMatch ? idMatch[ 0 ] : undefined;
const keyMatch = adjustmentOptions.key.match( /^[a-f\d]{32}$/ ); const keyMatch = adjustmentOptions.key.match( /^[a-f\d]{32}$/ );
const apiKey = keyMatch ? keyMatch[ 0 ] : undefined; const apiKey = keyMatch ? keyMatch[ 0 ] : undefined;