|
@@ -2,7 +2,7 @@
|
|
|
<legend class="alert-anchor">{{ t("security_setting.OAuth.GitHub.name") }} {{ t("security_setting.configuration") }}</legend>
|
|
<legend class="alert-anchor">{{ t("security_setting.OAuth.GitHub.name") }} {{ t("security_setting.configuration") }}</legend>
|
|
|
|
|
|
|
|
{% set nameForIsGitHubEnabled = "settingForm[security:passport-github:isEnabled]" %}
|
|
{% set nameForIsGitHubEnabled = "settingForm[security:passport-github:isEnabled]" %}
|
|
|
- {% set isGitHubEnabled = settingForm['security:passport-github:isEnabled'] %}
|
|
|
|
|
|
|
+ {% set isGitHubEnabled = getConfig('crowi', 'security:passport-github:isEnabled') %}
|
|
|
{% set siteUrl = getConfig('crowi', 'app:siteUrl') || '[INVALID]' %}
|
|
{% set siteUrl = getConfig('crowi', 'app:siteUrl') || '[INVALID]' %}
|
|
|
{% set callbackUrl = siteUrl + '/passport/github/callback' %}
|
|
{% set callbackUrl = siteUrl + '/passport/github/callback' %}
|
|
|
|
|
|
|
@@ -26,7 +26,7 @@
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<label for="settingForm[security:passport-github:clientId]" class="col-xs-3 control-label">{{ t("security_setting.clientID") }}</label>
|
|
<label for="settingForm[security:passport-github:clientId]" class="col-xs-3 control-label">{{ t("security_setting.clientID") }}</label>
|
|
|
<div class="col-xs-6">
|
|
<div class="col-xs-6">
|
|
|
- <input class="form-control" type="text" name="settingForm[security:passport-github:clientId]" value="{{ settingForm['security:passport-github:clientId'] || '' }}">
|
|
|
|
|
|
|
+ <input class="form-control" type="text" name="settingForm[security:passport-github:clientId]" value="{{ getConfig('crowi', 'security:passport-github:clientId') | default('') }}">
|
|
|
<p class="help-block">
|
|
<p class="help-block">
|
|
|
<small>
|
|
<small>
|
|
|
{{ t("security_setting.Use env var if empty", "OAUTH_GITHUB_CLIENT_SECRET") }}
|
|
{{ t("security_setting.Use env var if empty", "OAUTH_GITHUB_CLIENT_SECRET") }}
|
|
@@ -38,7 +38,7 @@
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<label for="settingForm[security:passport-github:clientSecret]" class="col-xs-3 control-label">{{ t("security_setting.client_secret") }}</label>
|
|
<label for="settingForm[security:passport-github:clientSecret]" class="col-xs-3 control-label">{{ t("security_setting.client_secret") }}</label>
|
|
|
<div class="col-xs-6">
|
|
<div class="col-xs-6">
|
|
|
- <input class="form-control" type="text" name="settingForm[security:passport-github:clientSecret]" value="{{ settingForm['security:passport-github:clientSecret'] || '' }}">
|
|
|
|
|
|
|
+ <input class="form-control" type="text" name="settingForm[security:passport-github:clientSecret]" value="{{ getConfig('crowi', 'security:passport-github:clientSecret') | default('') }}">
|
|
|
<p class="help-block">
|
|
<p class="help-block">
|
|
|
<small>
|
|
<small>
|
|
|
{{ t("security_setting.Use env var if empty", "OAUTH_GITHUB_CLIENT_SECRET") }}
|
|
{{ t("security_setting.Use env var if empty", "OAUTH_GITHUB_CLIENT_SECRET") }}
|
|
@@ -64,7 +64,7 @@
|
|
|
<div class="col-xs-6 col-xs-offset-3">
|
|
<div class="col-xs-6 col-xs-offset-3">
|
|
|
<div class="checkbox checkbox-info">
|
|
<div class="checkbox checkbox-info">
|
|
|
<input type="checkbox" id="bindByUserName-GitHub" name="settingForm[security:passport-github:isSameUsernameTreatedAsIdenticalUser]" value="1"
|
|
<input type="checkbox" id="bindByUserName-GitHub" name="settingForm[security:passport-github:isSameUsernameTreatedAsIdenticalUser]" value="1"
|
|
|
- {% if settingForm['security:passport-github:isSameUsernameTreatedAsIdenticalUser'] %}checked{% endif %} />
|
|
|
|
|
|
|
+ {% if getConfig('crowi', 'security:passport-github:isSameUsernameTreatedAsIdenticalUser') %}checked{% endif %} />
|
|
|
<label for="bindByUserName-GitHub">
|
|
<label for="bindByUserName-GitHub">
|
|
|
{{ t("security_setting.Treat username matching as identical", "username") }}
|
|
{{ t("security_setting.Treat username matching as identical", "username") }}
|
|
|
</label>
|
|
</label>
|