Merge branch 'master' into GPII-1536

GPII · Dec 16, 2015 · f833b22 · f833b22
2 parents 173dbfd + 668a53b
commit f833b22
Show file tree

Hide file tree

Showing 39 changed files with 1,552 additions and 51 deletions.
diff --git a/examples/easit-oauth-integration/EasitTestOauthDatastore.js b/examples/easit-oauth-integration/EasitTestOauthDatastore.js
@@ -77,6 +77,14 @@ fluid.defaults("gpii.oauth2.easitSampleDataStore", {
                 oauth2ClientSecret: false,
                 redirectUri: false,
                 allowDirectGpiiTokenAccess: false
+            },
+            {
+                id: 6,
+                name: "First Discovery",
+                oauth2ClientId: "net.gpii.prefsEditors.firstDiscovery",
+                oauth2ClientSecret: "client_secret_firstDiscovery",
+                allowDirectGpiiTokenAccess: false,
+                allowAddPrefs: true
             }
         ],
         authDecisionsIdSeq: 6,
@@ -126,7 +134,8 @@ fluid.defaults("gpii.oauth2.easitSampleDataStore", {
                 selectedPreferences: { "": true },
                 revoked: false
             }
-        ]
+        ],
+        clientCredentialsTokensIdSeq: 1
     }
 });
 

diff --git a/gpii/configs/untrusted.development.all.local.json b/gpii/configs/untrusted.development.all.local.json
@@ -30,14 +30,7 @@
             {
                 "record": "http://localhost:8088",
                 "target": "{that cloudBasedConfig}.options.matchMakers.flat.url"
-            },
-            {
-                "record": "gpii.oauth2.testDataStore",
-                "target": "{that cloudBasedConfig gpii.oauth2.dataStore}.options.gradeNames"
             }
         ]
-    },
-    "modules": [
-        "../../testData/security/TestOAuth2DataStore.js"
-    ]
+    }
 }
diff --git a/gpii/node_modules/deviceReporter/src/DeviceReporter.js b/gpii/node_modules/deviceReporter/src/DeviceReporter.js
diff --git a/gpii/node_modules/deviceReporter/src/DeviceReporterUtilities.js b/gpii/node_modules/deviceReporter/src/DeviceReporterUtilities.js
diff --git a/gpii/node_modules/flowManager/configs/cloudBased.development.all.local.json b/gpii/node_modules/flowManager/configs/cloudBased.development.all.local.json
diff --git a/gpii/node_modules/flowManager/test/SaveTests.js b/gpii/node_modules/flowManager/test/SaveTests.js
diff --git a/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthServer.js b/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthServer.js
diff --git a/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthorizationService.js b/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthorizationService.js