nodebb-plugin-sso-facebook 4.0.2 → 4.0.4

package/.gitattributes

@@ -1,22 +1,22 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

package/LICENSE

@@ -1,8 +1,8 @@
-Copyright (c) 2013-2014, psychobunny <psycho.bunny@hotmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Copyright (c) 2013-2014, psychobunny <psycho.bunny@hotmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,7 +1,7 @@
-# NodeBB Facebook SSO
-
-NodeBB Plugin that allows users to login/register via their Facebook account.
-
-## Installation
-
+# NodeBB Facebook SSO
+
+NodeBB Plugin that allows users to login/register via their Facebook account.
+
+## Installation
+
     npm install nodebb-plugin-sso-facebook

package/library.js

@@ -227,6 +227,7 @@
 
 	Facebook.login = function (fbid, name, email, picture, accessToken, refreshToken, profile, callback) {
 		winston.verbose("Facebook.login fbid, name, email, picture: " + fbid + ", " + name + ", " + email + ", " + picture);
+		const autoConfirm = Facebook.settings && Facebook.settings.autoconfirm === "on" ? 1 : 0;
 
 		Facebook.getUidByFbid(fbid, function (err, uid) {
 			if (err) {
@@ -242,14 +243,14 @@
 				});
 			} else {
 				// New User
-				var success = function (uid) {
+				var success = async (uid) => {
 					// Save facebook-specific information to the user
 					user.setUserField(uid, 'fbid', fbid);
 					db.setObjectField('fbid:uid', fbid, uid);
-					var autoConfirm = Facebook.settings && Facebook.settings.autoconfirm === "on" ? 1 : 0;
 
 					if (autoConfirm) {
-						user.email.confirmByUid(uid);
+						await user.setUserField(uid, 'email', email);
+						await user.email.confirmByUid(uid);
 					}
 
 					// Save their photo, if present
@@ -276,7 +277,7 @@
 							return callback(new Error('[[error:sso-registration-disabled, Facebook]]'));
 						}
 
-						user.create({ username: name, email: email }, function (err, uid) {
+						user.create({ username: name, email: !autoConfirm ? email : undefined }, function (err, uid) {
 							if (err) {
 								return callback(err);
 							}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-sso-facebook",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "NodeBB Facebook SSO",
   "main": "library.js",
   "repository": {

package/static/lib/admin.js

@@ -1,26 +1,26 @@
-define('admin/plugins/sso-facebook', ['settings'], function(Settings) {
-	'use strict';
-	/* globals $, app, socket, require */
-
-	var ACP = {};
-
-	ACP.init = function() {
-		Settings.load('sso-facebook', $('.sso-facebook-settings'));
-
-		$('#save').on('click', function() {
-			Settings.save('sso-facebook', $('.sso-facebook-settings'), function() {
-				app.alert({
-					type: 'success',
-					alert_id: 'sso-facebook-saved',
-					title: 'Settings Saved',
-					message: 'Please reload your NodeBB to apply these settings',
-					clickfn: function() {
-						socket.emit('admin.reload');
-					}
-				});
-			});
-		});
-	};
-
-	return ACP;
+define('admin/plugins/sso-facebook', ['settings'], function(Settings) {
+	'use strict';
+	/* globals $, app, socket, require */
+
+	var ACP = {};
+
+	ACP.init = function() {
+		Settings.load('sso-facebook', $('.sso-facebook-settings'));
+
+		$('#save').on('click', function() {
+			Settings.save('sso-facebook', $('.sso-facebook-settings'), function() {
+				app.alert({
+					type: 'success',
+					alert_id: 'sso-facebook-saved',
+					title: 'Settings Saved',
+					message: 'Please reload your NodeBB to apply these settings',
+					clickfn: function() {
+						socket.emit('admin.reload');
+					}
+				});
+			});
+		});
+	};
+
+	return ACP;
 });

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

@@ -51,6 +51,4 @@
 	</div>
 </div>
 
-<button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-	<i class="material-icons">save</i>
-</button>
+<!-- IMPORT admin/partials/save_button.tpl -->