comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Login/Auth and pariticipate. Telegram auth (wip)

Browse source
This commit is contained in:
vjrj 2017-12-22 09:33:37 +01:00
parent 91b4197b04
commit 4227389a67
14 changed files with 161 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
imports/api/ActiveFires/server/publications.js
View file

@ -118,10 +118,10 @@ Meteor.publish('activefiresmyloc', function activeInMyLoc(zoom, lat, lng, height
check(height, NullOr(Number));
check(width, NullOr(Number));
// console.log(`Check active fires in ${lat},${lng} with zoom ${zoom} pixels in ${height}x${width} map`);
if (lat === null || lng === null) {
const location = localize();
// console.log(`${location.latitude}, ${location.longitude}`);
return activefires(zoom, location.latitude, location.longitude, height, width);
if (lat && lng) {
return activefires(zoom, lat, lng, height, width);
}
return activefires(zoom, lat, lng, height, width);
const location = localize();
// console.log(`${location.latitude}, ${location.longitude}`);
return activefires(zoom, location.latitude, location.longitude, height, width);
});

8
imports/api/Users/Users.js
View file

@ -3,13 +3,13 @@
import { Meteor } from 'meteor/meteor';
import SimpleSchema from 'simpl-schema';
import { defaultCreatedAt, defaultUpdateAt } from '/imports/api/Utility/Utils.js';
import i18n from 'i18next';
const schemaUserProfile = new SimpleSchema({
// name: { type: String, optional: true },
name: Object,
/* Our users has a name of type Object while Google Service, for instance, not */
/* name: { type: String, optional: true }, */
/* name: Object,
'name.first': String,
'name.last': String,
'name.last': String, */
lang: { type: String, optional: true },
telegramChatId: { type: Number, optional: true },
telegramUsername: { type: String, optional: true },