Merge pull request #470 from hypothesis/allow-oauth-enabled-override

Allow "oauthEnabled" setting to be overridden in client config
hypothesis · Jun 28, 2017 · 6f3d331 · 6f3d331
2 parents eb093f7 + 7a15733
commit 6f3d331
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/annotator/config/index.js b/src/annotator/config/index.js
@@ -23,6 +23,9 @@ function configFrom(window_) {
     enableMultiFrameSupport: settings.hostPageSetting('enableMultiFrameSupport'),
     embedScriptUrl: settings.hostPageSetting('embedScriptUrl'),
     subFrameInstance: settings.hostPageSetting('subFrameInstance'),
+
+    // Temporary feature flag override for 1st-party OAuth
+    oauthEnabled: settings.hostPageSetting('oauthEnabled'),
   };
 }
 

diff --git a/src/annotator/config/test/index-test.js b/src/annotator/config/test/index-test.js
@@ -94,6 +94,7 @@ describe('annotator.config.index', function() {
       var settings = {
         'openLoginForm': 'OPEN_LOGIN_FORM_SETTING',
         'openSidebar': 'OPEN_SIDEBAR_SETTING',
+        'oauthEnabled': true,
         'branding': 'BRANDING_SETTING',
         'services': 'SERVICES_SETTING',
       };

diff --git a/src/sidebar/host-config.js b/src/sidebar/host-config.js
@@ -16,7 +16,7 @@ function hostPageConfig(window) {
   var paramWhiteList = [
     // Direct-linked annotation ID
     'annotations',
-                        
+
     // Default query passed by url
     'query',
 
@@ -31,6 +31,10 @@ function hostPageConfig(window) {
     'showHighlights',
     'services',
     'branding',
+
+    // OAuth feature flag override.
+    // This should be removed once OAuth is enabled for first party accounts.
+    'oauthEnabled',
   ];
 
   return Object.keys(config).reduce(function (result, key) {

diff --git a/src/sidebar/test/host-config-test.js b/src/sidebar/test/host-config-test.js
@@ -15,6 +15,7 @@ describe('hostPageConfig', function () {
     var window_ = fakeWindow({
       annotations: '1234',
       appType: 'bookmarklet',
+      oauthEnabled: true,
       openSidebar: true,
       openLoginForm: true,
       showHighlights: true,
@@ -26,6 +27,7 @@ describe('hostPageConfig', function () {
     assert.deepEqual(hostPageConfig(window_), {
       annotations: '1234',
       appType: 'bookmarklet',
+      oauthEnabled: true,
       openSidebar: true,
       openLoginForm: true,
       showHighlights: true,