Add OAuth public and private key in setting

Author: dati18

dist-persist/wbstack/src/Settings/LocalSettings.php

@@ -29,7 +29,6 @@
 $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass';
 $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';
 $wwLocalization = new Localization( $wgExtensionMessagesFiles, $wgMessagesDirs, $wgBaseDirectory, $wwIsLocalisationRebuild );
-$wwDockerCompose = getenv('WBSTACK_DOCKER_COMPOSE') === 'yes';
 
 $wwUseMailgunExtension = true; // default for wbstack
 if (getenv('MW_MAILGUN_DISABLED') === 'yes') {
@@ -94,7 +93,7 @@
     ];
 }
 
-if ( $wwDockerCompose ) {
+if ( $wwDomainSaysLocal ) {
     $wgServer = "http://" . $wikiInfo->domain;
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
@@ -325,6 +324,8 @@ function onBeforePageDisplay( &$out, &$skin ) {
 $wgGroupPermissions['platform']['mwoauthmanageconsumer'] = true;
 $wgGroupPermissions['platform']['mwoauthviewprivate'] = true;
 $wgGroupPermissions['platform']['mwoauthupdateownconsumer'] = true;
+$wgOAuth2PrivateKey = '/mediawiki/jwtRS256.key';
+$wgOAuth2PublicKey = '/mediawiki/jwtRS256.key.pub';
 
 #######################################
 ## ---          Skins            --- ##

dist/wbstack/src/Settings/LocalSettings.php

@@ -29,7 +29,6 @@
 $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass';
 $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';
 $wwLocalization = new Localization( $wgExtensionMessagesFiles, $wgMessagesDirs, $wgBaseDirectory, $wwIsLocalisationRebuild );
-$wwDockerCompose = getenv('WBSTACK_DOCKER_COMPOSE') === 'yes';
 
 $wwUseMailgunExtension = true; // default for wbstack
 if (getenv('MW_MAILGUN_DISABLED') === 'yes') {
@@ -94,7 +93,7 @@
     ];
 }
 
-if ( $wwDockerCompose ) {
+if ( $wwDomainSaysLocal ) {
     $wgServer = "http://" . $wikiInfo->domain;
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
@@ -325,6 +324,8 @@ function onBeforePageDisplay( &$out, &$skin ) {
 $wgGroupPermissions['platform']['mwoauthmanageconsumer'] = true;
 $wgGroupPermissions['platform']['mwoauthviewprivate'] = true;
 $wgGroupPermissions['platform']['mwoauthupdateownconsumer'] = true;
+$wgOAuth2PrivateKey = '/mediawiki/jwtRS256.key';
+$wgOAuth2PublicKey = '/mediawiki/jwtRS256.key.pub';
 
 #######################################
 ## ---          Skins            --- ##

jwtRS256.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key
+# Don't add passphrase
+openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub
+cat jwtRS256.key
+cat jwtRS256.key.pub