user set callback URL

README.md

@@ -168,8 +168,10 @@ Environment Variables
 * **Option (Overwritable in admin page)**
     * OAUTH_GOOGLE_CLIENT_ID: Google API client id for OAuth login
     * OAUTH_GOOGLE_CLIENT_SECRET: Google API client secret for OAuth login
+    * OAUTH_GOOGLE_CALLBACK_URL: Google API callback URL for OAuth login
     * OAUTH_GITHUB_CLIENT_ID: GitHub API client id for OAuth login
     * OAUTH_GITHUB_CLIENT_SECRET: GitHub API client secret for OAuth login
+    * OAUTH_GITHUB_CALLBACK_URL: GitHub API callback URL for OAuth login
 
 
 Documentation

lib/service/passport.js

@@ -267,7 +267,7 @@ class PassportService {
     passport.use(new GoogleStrategy({
       clientId: config.crowi['security:passport-google:clientId'] || process.env.OAUTH_GOOGLE_CLIENT_SECRET,
       clientSecret: config.crowi['security:passport-google:clientSecret'] || process.env.OAUTH_GOOGLE_CLIENT_SECRET,
-      callbackURL: config.crowi['security:passport-google:callbackURL'],
+      callbackURL: config.crowi['security:passport-google:callbackURL'] || process.env.OAUTH_GOOGLE_CALLBACK_URL,
       skipUserProfile: false,
     }, function(accessToken, refreshToken, profile, done) {
       if (profile) {
@@ -313,7 +313,7 @@ class PassportService {
     passport.use(new GitHubStrategy({
       clientID: config.crowi['security:passport-github:clientId'] || process.env.OAUTH_GITHUB_CLIENT_ID,
       clientSecret: config.crowi['security:passport-github:clientSecret'] || process.env.OAUTH_GITHUB_CLIENT_SECRET,
-      callbackURL: config.crowi['security:passport-github:callbackURL'],
+      callbackURL: config.crowi['security:passport-github:callbackURL'] || process.env.OAUTH_GITHUB_CALLBACK_URL,
       skipUserProfile: false,
     }, function(accessToken, refreshToken, profile, done) {
       if (profile) {

lib/views/admin/widget/passport/google-oauth.html

@@ -52,7 +52,7 @@
         <input class="form-control" type="text" name="settingForm[security:passport-google:callbackURL]" value="{{ settingForm['security:passport-google:callbackURL'] || '' }}">
         <p class="help-block">
           <small>
-            {{ t("security_setting.Use env var if empty", "OAUTH_GOOGLE_callback_URL") }}
+            {{ t("security_setting.Use env var if empty", "OAUTH_GOOGLE_CALLBACK_URL") }}
           </small>
         </p>
       </div>