Several changes:

 - Merges from master:
   - Issue #5694: respond to poll immediately if we still have unacked JavaScript
   - Added missing users() definition in auth tutorial
   - override dropEvent in WStandardItemModel
   - add 'session-thread-pool' wt_config.xml option for #5308
   - Added OpenIDConnect feature
   - WAxisSliderWidget: Set the clip path when drawing the series (issue #5668)
   - #5663: don't cache senderId for JSignals, change object name after JSignals have been removed
   - #5658: allow fields containing 'from' in sql select statements
   - Issue #5648: document that WServer::stop() stops the underlying WIOService
   - Fixed setObjectName() on WAbstractItemView after construction
   - WPopupWidget/WPopupMenu: Call bind/unbind function with the right object
   - Json move semantics and initializer list syntax
   - Merge pull request emweb#94 from bryongloden/patch-1
     Update WMessageResources.C
 - Wt 4 specific:
   - Set version back to 4.0.0
   - Fixed comments that were changed by overzealous script

Author: RockinRoel

CMakeLists.txt

@@ -16,9 +16,9 @@ SET(CMAKE_MODULE_PATH
   ${WT_SOURCE_DIR}/cmake
 )
 
-SET(VERSION_SERIES 3)
-SET(VERSION_MAJOR 3)
-SET(VERSION_MINOR 7)
+SET(VERSION_SERIES 4)
+SET(VERSION_MAJOR 0)
+SET(VERSION_MINOR 0)
 
 SET(WT_SOVERSION 41)
 SET(WTEXT_SOVERSION 41)

Doxyfile

@@ -32,7 +32,7 @@ PROJECT_NAME           = Wt
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 3.3.7
+PROJECT_NUMBER         = 4.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

doc/tutorial/auth.doc

@@ -456,6 +456,11 @@ void Session::configureAuth()
     myOAuthServices[i]->generateRedirectEndpoint();
 }
 
+Wt::Auth::AbstractUserDatabase& Session::users()
+{
+  return *users_;
+}
+
 const Wt::Auth::AuthService& Session::auth()
 {
   return myAuthService;

examples/Doxyfile

@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = "Wt examples"
-PROJECT_NUMBER         = 3.3.7
+PROJECT_NUMBER         = 4.0.0
 OUTPUT_DIRECTORY       = ../doc/examples
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

examples/feature/CMakeLists.txt

@@ -2,13 +2,14 @@ SUBDIRS(
   auth1
   auth2
   broadcast
-  client-ssl-auth 
+  client-ssl-auth
   dbo
   locale
   mediaplayer
   miniwebgl
   multiple_servers
   oauth
+  oidc
   paypal
   scrollvisibility
   serverpush

examples/feature/auth1/model/User.C

@@ -9,4 +9,3 @@
 #include <Wt/Auth/Dbo/AuthInfo.h>
 
 DBO_INSTANTIATE_TEMPLATES(User)
-

examples/feature/oidc/CMakeLists.txt

@@ -0,0 +1,16 @@
+WT_ADD_EXAMPLE(oidc.wt
+	Oidc.C
+        OAuthWidget.C
+        RegistrationView.C
+        OAuthAuthorizationEndpoint.C
+        model/User.C
+	model/IssuedToken.C
+	model/OAuthClient.C
+        model/OidcUserDatabase.C
+        model/Session.C
+        model/UserDetailsModel.C
+)
+
+TARGET_LINK_LIBRARIES(oidc.wt wtdbo wtdbosqlite3)
+
+INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src)

examples/feature/oidc/OAuthAuthorizationEndpoint.C

@@ -0,0 +1,38 @@
+#include <string>
+
+#include <Wt/WContainerWidget>
+#include <Wt/WText>
+
+#include <Wt/Auth/AuthModel>
+#include <Wt/Auth/AuthService>
+
+#include "OAuthAuthorizationEndpoint.h"
+
+typedef Wt::Auth::Dbo::AuthInfo<User> AuthInfo;
+typedef Wt::Auth::Dbo::UserDatabase<AuthInfo> UserDatabase;
+
+OAuthAuthorizationEndpoint::OAuthAuthorizationEndpoint(const Wt::WEnvironment& env,
+                                                       std::unique_ptr<Session> session)
+  : Wt::WApplication(env), session_(std::move(session))
+{
+  messageResourceBundle().use("strings");
+  messageResourceBundle().use("templates");
+
+  auto authwidget = Wt::cpp14::make_unique<OAuthWidget>(*session_);
+  authwidget->model()->addPasswordAuth(&Session::passwordAuth());
+  authwidget->setRegistrationEnabled(true);
+  authwidget->processEnvironment();
+
+  process_ = Wt::cpp14::make_unique<Wt::Auth::OAuthAuthorizationEndpointProcess>(
+      session->login(),
+      session->users());
+  process_->authorized().connect(
+      process_.get(),
+      &Wt::Auth::OAuthAuthorizationEndpointProcess::authorizeScope);
+  process_->processEnvironment();
+
+  if (process_->validRequest()) {
+    root()->addWidget(std::move(authwidget));
+  } else
+    root()->addWidget(Wt::cpp14::make_unique<Wt::WText>(Wt::utf8("The request was invalid.")));
+}

examples/feature/oidc/OAuthAuthorizationEndpoint.h

@@ -0,0 +1,27 @@
+#include <string>
+
+#include <Wt/WApplication>
+#include <Wt/WEnvironment>
+
+#include <Wt/Auth/OAuthAuthorizationEndpointProcess>
+
+#include "model/OidcUserDatabase.h"
+#include "model/User.h"
+#include "model/Session.h"
+#include "OAuthWidget.h"
+
+typedef Wt::Auth::Dbo::AuthInfo<User> AuthInfo;
+typedef Wt::Auth::Dbo::UserDatabase<AuthInfo> UserDatabase;
+
+class OAuthAuthorizationEndpoint : public Wt::WApplication
+{
+public:
+  OAuthAuthorizationEndpoint(const Wt::WEnvironment& env,
+                             std::unique_ptr<Session> session);
+
+  static Wt::WApplication *createAuthEndpoint(const Wt::WEnvironment& env,
+                                              std::string dbPath);
+private:
+  std::unique_ptr<Session> session_;
+  std::unique_ptr<Wt::Auth::OAuthAuthorizationEndpointProcess> process_;
+};

examples/feature/oidc/OAuthWidget.C

@@ -0,0 +1,30 @@
+#include <Wt/Auth/AuthService>
+#include <Wt/Auth/AbstractUserDatabase>
+#include <Wt/Auth/AuthWidget>
+#include <Wt/Auth/Login>
+#include <Wt/Auth/Identity>
+#include <Wt/Auth/RegistrationModel>
+#include <Wt/WWidget>
+#include <Wt/WContainerWidget>
+
+#include "OAuthWidget.h"
+#include "RegistrationView.h"
+
+OAuthWidget::OAuthWidget(Session& session)
+  : Wt::Auth::AuthWidget(Session::auth(),
+                         session.users(),
+                         session.login()),
+                         session_(session)
+{
+}
+
+std::unique_ptr<Wt::WWidget> OAuthWidget::createRegistrationView(const Wt::Auth::Identity& id)
+{
+  auto w = Wt::cpp14::make_unique<RegistrationView>(session_, this);
+  auto model = createRegistrationModel();
+
+  if (id.isValid())
+    model->registerIdentified(id);
+  w->setModel(std::move(model));
+  return w;
+}