Skip to content

Set default name in Config.h #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesgol wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Set default name in Config.h #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac594c1
Set default name in Config.h
jamesgol Apr 1, 2018
11e85c7
Make sure the realm is actually passed to the client
jamesgol Apr 10, 2018
55d2cad
Revert default config for now
jamesgol Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/BrewPiLess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,8 @@ class BrewPiWebHandler: public AsyncWebHandler
String data=request->getParam("data", true, false)->value();
//DBG_PRINTF("putline:%s\n",data.c_str());

if(data.startsWith("j") && !request->authenticate(username, password))
return request->requestAuthentication();
if(data.startsWith("j") && !request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);

brewPi.putLine(data.c_str());
request->send(200,"application/json","{}");
Expand All @@ -427,8 +427,8 @@ class BrewPiWebHandler: public AsyncWebHandler
else if(request->method() == HTTP_GET && request->url() == CONFIG_PATH){
request->redirect(request->url() + ".htm");
}else if(request->method() == HTTP_POST && request->url() == CONFIG_PATH){
if(!request->authenticate(username, password))
return request->requestAuthentication();
if(!request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);

if(request->hasParam("data", true)){

Expand Down Expand Up @@ -472,27 +472,27 @@ class BrewPiWebHandler: public AsyncWebHandler
AsyncWebParameter* tvalue = request->getParam("off", true);
DBG_PRINTF("Set timezone:%ld\n",tvalue->value().toInt());
TimeKeeper.setTimezoneOffset(tvalue->value().toInt());
}
}
request->send(200,"application/json","{}");

}else if(request->method() == HTTP_GET && request->url() == RESETWIFI_PATH){
if(!request->authenticate(username, password))
return request->requestAuthentication();
if(!request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);
request->send(200,"text/html","Done, restarting..");
requestRestart(true);
}else if(request->method() == HTTP_POST && request->url() == FLIST_PATH){
if(!request->authenticate(username, password))
return request->requestAuthentication();
if(!request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);

handleFileList(request);
}else if(request->method() == HTTP_DELETE && request->url() == DELETE_PATH){
if(!request->authenticate(username, password))
return request->requestAuthentication();
if(!request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);

handleFileDelete(request);
}else if(request->method() == HTTP_POST && request->url() == FPUTS_PATH){
if(!request->authenticate(username, password))
return request->requestAuthentication();
if(!request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);

handleFilePuts(request);
}else if(request->method() == HTTP_GET && request->url() == GETSTATUS_PATH){
Expand Down Expand Up @@ -538,8 +538,8 @@ class BrewPiWebHandler: public AsyncWebHandler
#endif
#if AUTO_CAP
else if(request->url() == CAPPER_PATH){
if(!request->authenticate(username, password))
return request->requestAuthentication();
if(!request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);
// auto cap.
bool response=true;
if(request->hasParam("cap")){
Expand Down Expand Up @@ -584,8 +584,8 @@ class BrewPiWebHandler: public AsyncWebHandler
}
}

if(auth && !request->authenticate(username, password))
return request->requestAuthentication();
if(auth && !request->authenticate(username, password, DEFAULT_NAME))
return request->requestAuthentication(DEFAULT_NAME);

sendFile(request,path); //request->send(SPIFFS, path);
}
Expand Down Expand Up @@ -1031,10 +1031,10 @@ class ExternalDataHandler:public AsyncWebHandler
if(length ==0) return request->send(500);;

uint8_t error;
if(externalData.processJSON(data,length,request->authenticate(username, password),error)){
if(externalData.processJSON(data,length,request->authenticate(username, password, DEFAULT_NAME),error)){
request->send(200,"application/json","{}");
}else{
if(error == ErrorAuthenticateNeeded) return request->requestAuthentication();
if(error == ErrorAuthenticateNeeded) return request->requestAuthentication(DEFAULT_NAME);
else request->send(500);
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,10 @@

#define EMIWorkaround 1
#define BPL_VERSION "2.7"
#define DEFAULT_NAME "brewpiless"
#define DEFAULT_USERNAME DEFAULT_NAME
#define DEFAULT_PASS DEFAULT_NAME


#ifndef EanbleParasiteTempControl
#define EanbleParasiteTempControl 0
Expand Down
2 changes: 1 addition & 1 deletion src/WiFiSetup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class WiFiSetupClass
// void preInit(void);
void setNetwork(WiFiMode mode,IPAddress ip,IPAddress gw,IPAddress mask);

void begin(void){begin("brewpiless");}
void begin(void){begin(DEFAULT_NAME);}
void begin(char const *ssid,const char *passwd=NULL);
void beginAP(char const *ssid,const char *passwd=NULL);

Expand Down