Merge pull request #18 from seanfisher/update-auth-options

Update auth options and comments

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Launch Example App",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/example/login/app.js"
+        }
+    ]
+}

README.md

@@ -45,11 +45,6 @@ Microsoft's developer site.
 
         // [Optional] The token URL. Defaults to `https://login.microsoftonline.com/${tenant}/oauth2/v2.0/token`
         tokenURL: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
-
-        // [Optional] Prompt. Defaults to 'select_account'
-        // Some options: 'login', 'none', 'select_account', and 'consent'
-        // A good description of the options here: https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-implicit-grant-flow
-        prompt: 'select_account'
       },
       function(accessToken, refreshToken, profile, done) {
         User.findOrCreate({ userId: profile.id }, function (err, user) {
@@ -69,7 +64,12 @@ application:
 
 ```js
     app.get('/auth/microsoft',
-      passport.authenticate('microsoft'));
+      passport.authenticate('microsoft', {
+        // Optionally define any authentication parameters here
+        // For example, the ones in https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow
+
+        prompt: 'select_account',
+      }));
 
     app.get('/auth/microsoft/callback', 
       passport.authenticate('microsoft', { failureRedirect: '/login' }),

example/login/app.js

@@ -90,7 +90,10 @@ app.get('/login', function (req, res) {
 //   redirecting the user to the common Microsoft login endpoint. After authorization, Microsoft
 //   will redirect the user back to this application at /auth/microsoft/callback
 app.get('/auth/microsoft',
-  passport.authenticate('microsoft'),
+  passport.authenticate('microsoft', {
+    // Optionally add any authentication params here
+    prompt: 'select_account'
+  }),
   function (req, res) {
     // The request will be redirected to Microsoft for authentication, so this
     // function will not be called.

lib/strategy.js

@@ -50,7 +50,6 @@ function MicrosoftStrategy(options, verify) {
     options.tokenURL = options.tokenURL || `https://login.microsoftonline.com/${tenant}/oauth2/v2.0/token`;
     options.scopeSeparator = options.scopeSeparator || ' ';
     options.customHeaders = options.customHeaders || {};
-    options.prompt = options.prompt || 'select_account';
 
     OAuth2Strategy.call(this, options, verify)
     this.name = 'microsoft'
@@ -79,16 +78,12 @@ util.inherits(MicrosoftStrategy, OAuth2Strategy)
 MicrosoftStrategy.prototype.authorizationParams = function(options) {
     var params = {};
 
-    ['locale', 'display'].forEach(function(name) {
+    ['locale', 'display', 'prompt', 'login_hint', 'domain_hint'].forEach(function(name) {
       if (options[name]) {
         params[name] = options[name]
       }
     });
 
-    if (options.prompt) {
-        params['prompt'] = options.prompt;
-      }
-
     return params;
   };