nodebb-plugin-sso-github 3.0.4 → 3.1.1

package/library.js

@@ -209,6 +209,7 @@
 
 		hostHelpers.setupAdminPageRoute(data.router, '/admin/plugins/sso-github', function (req, res) {
 			res.render('admin/plugins/sso-github', {
+				title: constants.name,
 				callbackURL: nconf.get('url') + '/auth/github/callback'
 			});
 		});
@@ -218,37 +219,23 @@
 				service: "GitHub",
 			});
 		});
-		data.router.post('/deauth/github', [data.middleware.requireUser, data.middleware.applyCSRF], function (req, res, next) {
-			GitHub.deleteUserData({
+		data.router.post('/deauth/github', [data.middleware.requireUser, data.middleware.applyCSRF], hostHelpers.tryRoute(async function (req, res) {
+			await GitHub.deleteUserData({
 				uid: req.user.uid,
-			}, function (err) {
-				if (err) {
-					return next(err);
-				}
-
-				res.redirect(nconf.get('relative_path') + '/me/edit');
 			});
-		});
+			res.redirect(nconf.get('relative_path') + '/me/edit');
+		}));
 
 		callback();
 	};
 
-	GitHub.deleteUserData = function(data, callback) {
-		var uid = data.uid;
-
-		async.waterfall([
-			async.apply(User.getUserField, uid, 'githubid'),
-			function(oAuthIdToDelete, next) {
-				db.deleteObjectField('githubid:uid', oAuthIdToDelete, next);
-			},
-			async.apply(db.deleteObjectField, 'user:' + uid, 'githubid'),
-		], function(err) {
-			if (err) {
-				winston.error('[sso-github] Could not remove OAuthId data for uid ' + uid + '. Error: ' + err);
-				return callback(err);
-			}
-			callback(null, uid);
-		});
+	GitHub.deleteUserData = async function(data) {
+		const { uid } = data;
+		const githubid = await User.getUserField(uid, 'githubid');
+		if (githubid) {
+			await db.deleteObjectField('githubid:uid', oAuthIdToDelete, next);
+			await db.deleteObjectField('user:' + uid, 'githubid');
+		}
 	};
 
 	module.exports = GitHub;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-sso-github",
-  "version": "3.0.4",
+  "version": "3.1.1",
   "description": "NodeBB GitHub SSO",
   "main": "library.js",
   "repository": {
@@ -46,6 +46,6 @@
     "passport-github2": "^0.1.9"
   },
   "nbbpm": {
-    "compatibility": "^3.0.0"
+    "compatibility": "^4.0.0"
   }
 }

package/templates/admin/plugins/sso-github.tpl

@@ -1,45 +1,46 @@
-<div class="row">
-	<div class="col-sm-2 col-12 settings-header">GitHub SSO</div>
-	<div class="col-sm-10 col-12">
-		<div class="alert alert-info">
-			Register a new <strong>GitHub Application</strong> via
-			<a href="https://github.com/settings/developers">Developer Applications</a> and then paste your application details here.
-		</div>
-		<form class="sso-github-settings">
-			<div class="mb-3">
-				<label for="id">Client ID</label>
-				<input type="text" name="id" title="Client ID" class="form-control" placeholder="Client ID">
-			</div>
-			<div class="mb-3">
-				<label for="secret">Client Secret</label>
-				<input type="text" name="secret" title="Client Secret" class="form-control" placeholder="Client Secret" />
+<div class="acp-page-container">
+	<!-- IMPORT admin/partials/settings/header.tpl -->
+
+	<div class="row m-0">
+		<div id="spy-container" class="col-12 px-0 mb-4" tabindex="0">
+			<div class="alert alert-info">
+				Register a new <strong>GitHub Application</strong> via
+				<a href="https://github.com/settings/developers">Developer Applications</a> and then paste your application details here.
 			</div>
-			<div class="mb-3 alert alert-warning">
-				<label for="callback">Your NodeBB&apos;s "Authorization callback URL"</label>
-				<input type="text" id="callback" title="Authorization callback URL" class="form-control" value="{callbackURL}" readonly />
+			<form class="sso-github-settings">
+				<div class="mb-3">
+					<label for="id">Client ID</label>
+					<input type="text" name="id" title="Client ID" class="form-control" placeholder="Client ID">
+				</div>
+				<div class="mb-3">
+					<label for="secret">Client Secret</label>
+					<input type="text" name="secret" title="Client Secret" class="form-control" placeholder="Client Secret" />
+				</div>
+				<div class="mb-3 alert alert-warning">
+					<label for="callback">Your NodeBB&apos;s "Authorization callback URL"</label>
+					<input type="text" id="callback" title="Authorization callback URL" class="form-control" value="{callbackURL}" readonly />
+					<p class="form-text">
+						Ensure that this value is set in your GitHub application&apos;s settings
+					</p>
+				</div>
+				<div class="form-check">
+					<input type="checkbox" class="form-check-input" id="disableRegistration" name="disableRegistration" />
+					<label for="disableRegistration" class="form-check-label">
+						Disable user registration via SSO
+					</label>
+				</div>
+				<div class="form-check">
+					<input type="checkbox" class="form-check-input" id="needToVerifyEmail" name="needToVerifyEmail" />
+					<label for="needToVerifyEmail" class="form-check-label">
+						Need user to verify email
+					</label>
+				</div>
 				<p class="form-text">
-					Ensure that this value is set in your GitHub application&apos;s settings
+					Restricting registration means that only registered users can associate their account with this SSO strategy.
+					This restriction is useful if you have uesrs bypassing registration controls by using social media accounts, or
+					if you wish to use the NodeBB registration queue.
 				</p>
-			</div>
-			<div class="form-check">
-				<input type="checkbox" class="form-check-input" id="disableRegistration" name="disableRegistration" />
-				<label for="disableRegistration" class="form-check-label">
-					Disable user registration via SSO
-				</label>
-			</div>
-			<div class="form-check">
-				<input type="checkbox" class="form-check-input" id="needToVerifyEmail" name="needToVerifyEmail" />
-				<label for="needToVerifyEmail" class="form-check-label">
-					Need user to verify email
-				</label>
-			</div>
-			<p class="form-text">
-				Restricting registration means that only registered users can associate their account with this SSO strategy.
-				This restriction is useful if you have uesrs bypassing registration controls by using social media accounts, or
-				if you wish to use the NodeBB registration queue.
-			</p>
-		</form>
+			</form>
+		</div>
 	</div>
 </div>
-
-<!-- IMPORT admin/partials/save_button.tpl -->