github-personal/Mailu
1
0
Fork 0
mirror of https://github.com/outbackdingo/Mailu.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix setup utility setting correct value to env var API

Browse Source 
Fix IF statement for enabling API in nginx.conf
Use safer command for regenerating example API token.
This commit is contained in:
Dimitri Huisman
2023-01-30 13:16:07 +00:00
parent 9bd76536a1
commit 0673d32306
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/nginx/conf/nginx.conf
View File

@@ -252,7 +252,7 @@ http {
{% endif %}
{% endif %}
{% if API %}
{% if API == 'true' %}
location ~ {{ WEB_API or '/api' }} {
include /etc/nginx/proxy.conf;
proxy_pass http://$admin;

15
setup/static/render.js
View File

@@ -1,12 +1,7 @@
//API_TOKEN generator
var chars = "0123456789abcdefghijklmnopqrstuvwxyz!@#$%^&*()ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var tokenLength = 12;
var token = "";
for (var i = 0; i <= tokenLength; i++) {
var randomNumber = Math.floor(Math.random() * chars.length);
token += chars.substring(randomNumber, randomNumber +1);
}
var random_array = new Uint32Array(2);
crypto.getRandomValues(random_array);
var token = random_array[0].toString() + random_array[1].toString();
$(document).ready(function() {
if ($("#webmail").val() == 'none') {
@@ -53,7 +48,7 @@ $(document).ready(function() {
$("#api_token_label").show();
} else {
$("#api_path").hide();
$("#api_path").val("/api")
$("#api_path").val("")
$("#api_token").hide();
$("#api_token").prop('required',false);
$("#api_token").val("");
@@ -69,7 +64,7 @@ $(document).ready(function() {
$("#api_token_label").show();
} else {
$("#api_path").hide();
$("#api_path").val("/api")
$("#api_path").val("")
$("#api_token").hide();
$("#api_token").prop('required',false);
$("#api_token").val("");

2
setup/templates/steps/config.html
View File

@@ -93,7 +93,7 @@ manage your email domains, users, etc.</p>
It is not possible to use the API without an API token.</p>
<div class="form-group">
<input type="checkbox" name="api_enabled" value="false" id="api" >
<input type="checkbox" name="api_enabled" value="true" id="api" >
<label>Enable the API (and path to the API)</label>
<input class="form-control" type="text" name="api_path" id="api_path" style="display: none">
<label name="api_token_label" id="api_token_label">API token</label>