added specific organisation login

Deepak
1 parent c4d3e07d0f
Showing 43 changed files with 555 additions and 656 deletions Show diff stats
.meteor/packages
.meteor/versions
imports/api/documents/documents.js
imports/api/documents/documents.tests.js
imports/api/documents/methods.js
imports/api/documents/methods.tests.js
imports/api/documents/server/publications.js
imports/client/app/routes.js
imports/client/assets/css/icons/icomoon/styles.css
imports/client/views/org/app/module/navigation/PublicNavigation.js
imports/client/views/org/enter/module/EnterLayout.js
imports/collections/orgs/methods.js
imports/modules/document-editor.js
imports/modules/rate-limit.js
imports/server/accounts.js
imports/server/accounts/creation.js
imports/server/accounts/email-templates.js
imports/server/accounts/login.js
imports/server/accounts/resetPassword.js
imports/server/accounts/verifyEmail.js
@@ -16,7 +16,7 @@ standard-minifier-js@1.2.2    # JS minifier run for production mode
 es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
 ecmascript@0.6.3              # Enable ECMAScript2015+ syntax in app code
  
-accounts-password@1.3.4
+accounts-password
 accounts-base@1.2.14
 check
 audit-argument-checks@1.0.7
@@ -35,3 +35,5 @@ dburles:factory@1.0.0
 ddp-rate-limiter@1.0.6
 shell-server@0.2.2
 aldeed:simple-schema
+momentjs:moment
+meteorhacks:picker
@@ -56,6 +56,7 @@ mdg:validated-method@1.1.0
 mdg:validation-error@0.5.1
 meteor@1.6.1
 meteor-base@1.0.4
+meteorhacks:picker@1.0.3
 minifier-css@1.2.16
 minifier-js@1.2.18
 minimongo@1.0.20
@@ -63,6 +64,7 @@ mobile-experience@1.0.4
 mobile-status-bar@1.0.14
 modules@0.7.9
 modules-runtime@0.7.9
+momentjs:moment@2.17.1
 mongo@1.1.15
 mongo-id@1.0.6
 npm-bcrypt@0.9.2
@@ -1,36 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-import { SimpleSchema } from 'meteor/aldeed:simple-schema';
-import { Factory } from 'meteor/dburles:factory';
-
-const Documents = new Mongo.Collection('Documents');
-export default Documents;
-
-Documents.allow({
-  insert: () => false,
-  update: () => false,
-  remove: () => false,
-});
-
-Documents.deny({
-  insert: () => true,
-  update: () => true,
-  remove: () => true,
-});
-
-Documents.schema = new SimpleSchema({
-  title: {
-    type: String,
-    label: 'The title of the document.',
-  },
-  body: {
-    type: String,
-    label: 'The body of the document.',
-  },
-});
-
-Documents.attachSchema(Documents.schema);
-
-Factory.define('document', Documents, {
-  title: () => 'Factory Title',
-  body: () => 'Factory Body',
-});
@@ -1,11 +0,0 @@
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback */
-
-import { assert } from 'meteor/practicalmeteor:chai';
-import Documents from './documents.js';
-
-describe('Documents collection', function () {
-  it('registers the collection with Mongo properly', function () {
-    assert.equal(typeof Documents, 'object');
-  });
-});
@@ -1,35 +0,0 @@
-import { SimpleSchema } from 'meteor/aldeed:simple-schema';
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import Documents from './documents';
-import rateLimit from '../../modules/rate-limit.js';
-
-export const upsertDocument = new ValidatedMethod({
-  name: 'documents.upsert',
-  validate: new SimpleSchema({
-    _id: { type: String, optional: true },
-    title: { type: String, optional: true },
-    body: { type: String, optional: true },
-  }).validator(),
-  run(document) {
-    return Documents.upsert({ _id: document._id }, { $set: document });
-  },
-});
-
-export const removeDocument = new ValidatedMethod({
-  name: 'documents.remove',
-  validate: new SimpleSchema({
-    _id: { type: String },
-  }).validator(),
-  run({ _id }) {
-    Documents.remove(_id);
-  },
-});
-
-rateLimit({
-  methods: [
-    upsertDocument,
-    removeDocument,
-  ],
-  limit: 5,
-  timeRange: 1000,
-});
@@ -1,47 +0,0 @@
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback */
-
-import { Meteor } from 'meteor/meteor';
-import { assert } from 'meteor/practicalmeteor:chai';
-import { resetDatabase } from 'meteor/xolvio:cleaner';
-import { Factory } from 'meteor/dburles:factory';
-import Documents from './documents.js';
-import { upsertDocument, removeDocument } from './methods.js';
-
-describe('Documents methods', function () {
-  beforeEach(function () {
-    if (Meteor.isServer) {
-      resetDatabase();
-    }
-  });
-
-  it('inserts a document into the Documents collection', function () {
-    upsertDocument.call({
-      title: 'You can\'t arrest me, I\'m the Cake Boss!',
-      body: 'They went nuts!',
-    });
-
-    const getDocument = Documents.findOne({ title: 'You can\'t arrest me, I\'m the Cake Boss!' });
-    assert.equal(getDocument.body, 'They went nuts!');
-  });
-
-  it('updates a document in the Documents collection', function () {
-    const { _id } = Factory.create('document');
-
-    upsertDocument.call({
-      _id,
-      title: 'You can\'t arrest me, I\'m the Cake Boss!',
-      body: 'They went nuts!',
-    });
-
-    const getDocument = Documents.findOne(_id);
-    assert.equal(getDocument.title, 'You can\'t arrest me, I\'m the Cake Boss!');
-  });
-
-  it('removes a document from the Documents collection', function () {
-    const { _id } = Factory.create('document');
-    removeDocument.call({ _id });
-    const getDocument = Documents.findOne(_id);
-    assert.equal(getDocument, undefined);
-  });
-});
@@ -1,10 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { check } from 'meteor/check';
-import Documents from '../documents';
-
-Meteor.publish('documents.list', () => Documents.find());
-
-Meteor.publish('documents.view', (_id) => {
-  check(_id, String);
-  return Documents.find(_id);
-});
@@ -48,7 +48,7 @@ const detectOrg = () =&gt; {
   if(orgSlug!=""){
     Meteor.call('checkExistingOrg', {slug:orgSlug}, function(err, res) {
       if(res){
-        Session.set('orgId', res._id._str);
+        Session.set('orgId', res._id);
         Session.set('orgSlug', orgSlug);
         render(getOrgRoutes(),document.getElementById('app'));
       }else{
@@ -2,7 +2,7 @@
 	font-family: 'icomoon';
 	src:url('fonts/icomoon.eot?3p0rtw');
 	src:url('fonts/icomoon.eot?#iefix3p0rtw') format('embedded-opentype'),
-		url('fonts/icomoon.woff?3p0rtw') format('font-woff'),
+		url('fonts/icomoon.woff?3p0rtw') format('woff'),
 		url('fonts/icomoon.ttf?3p0rtw') format('truetype'),
 		url('fonts/icomoon.svg?3p0rtw#icomoon') format('svg');
 	font-weight: normal;
@@ -18,7 +18,7 @@ render(){
   var signup = `http://${mainSite}/signup`;
   return(
     <Nav pullRight>
-      <LinkContainer to={ setQueryParam(this.props.location, { enter: 'login' }) }>
+      <LinkContainer to="login">
         <NavItem eventKey={ 2 } href="/login">Log In</NavItem>
       </LinkContainer>
     </Nav>
@@ -37,6 +37,7 @@ export class EnterLayout extends React.Component {
       error:        '',
       message:      '',
     };
+    this.onClearState = this.onClearState.bind(this);
   };
  
   componentWillReceiveProps(nextProps) {
@@ -100,28 +101,39 @@ export class EnterLayout extends React.Component {
   };
  
   onLogin(e) {
+    const self = this;
     e.preventDefault();
+    const email = this.state.email;
+    const password = this.state.password;
     this.onClearState(true);
-    if(this.state.email.trim() == '' || !validation.validateEmail(this.state.email)){
+    if(email.trim() == '' || !validation.validateEmail(this.state.email)){
       this.onClearState();
       Bert.alert('Please enter a valid email address!', 'danger');
       return false;
     }
-    if(this.state.password.trim() == ''){
+    if(password.trim() == ''){
       Bert.alert('Please enter your password!', 'danger');
       this.onClearState();
       return false;
     }
-    Meteor.loginWithPassword(
-      this.state.email,
-      this.state.password,
-      (e, r) => {
-        this.onClearState();
-        if(e) {
-          this.setState({error: 'Wrong email or password.'})
-        }
+    Meteor.call('checkEmailInOrg', {email:email,orgId:Session.get('orgId')}, function (error, result) {
+      if(result.success){
+        Meteor.loginWithPassword(
+          email,
+          password,
+          (e, r) => {
+            self.onClearState();
+            if(e) {
+              self.setState({error: 'Wrong password.'})
+            }
+          }
+        );
+      }else{
+        Bert.alert('This email is not associated to this Organisation!', 'danger');
+        self.onClearState();
       }
-    );
+
+   });
   };
  
   render() {
@@ -31,5 +31,24 @@ export const checkExistingOrg = new ValidatedMethod({
     org = Orgs.findOne({slug:slug});
     return org;
   },
+});
+
+export const checkEmailInOrg = new ValidatedMethod({
+  name: 'checkEmailInOrg',
+
+  validate: new SimpleSchema({
+    email: { type: String },
+    orgId: { type: String },
+  }).validator(),
+
+  run({email, orgId}) {
+    console.log(orgId);
+    user = Users.findOne({"orgId":orgId, "emails.address":email});
+    if(user){
+      return {success:true}
+    }else{
+      return {success:false}
+    }
+  },
  
 });
@@ -1,56 +0,0 @@
-/* eslint-disable no-undef */
-
-import { browserHistory } from 'react-router';
-import { Bert } from 'meteor/themeteorchef:bert';
-import { upsertDocument } from '../api/documents/methods.js';
-import './validation.js';
-
-let component;
-
-const handleUpsert = () => {
-  const { doc } = component.props;
-  const confirmation = doc && doc._id ? 'Document updated!' : 'Document added!';
-  const upsert = {
-    title: document.querySelector('[name="title"]').value.trim(),
-    body: document.querySelector('[name="body"]').value.trim(),
-  };
-
-  if (doc && doc._id) upsert._id = doc._id;
-
-  upsertDocument.call(upsert, (error, response) => {
-    if (error) {
-      Bert.alert(error.reason, 'danger');
-    } else {
-      component.documentEditorForm.reset();
-      Bert.alert(confirmation, 'success');
-      browserHistory.push(`/documents/${response.insertedId || doc._id}`);
-    }
-  });
-};
-
-const validate = () => {
-  $(component.documentEditorForm).validate({
-    rules: {
-      title: {
-        required: true,
-      },
-      body: {
-        required: true,
-      },
-    },
-    messages: {
-      title: {
-        required: 'Need a title in here, Seuss.',
-      },
-      body: {
-        required: 'This thneeds a body, please.',
-      },
-    },
-    submitHandler() { handleUpsert(); },
-  });
-};
-
-export default function documentEditor(options) {
-  component = options.component;
-  validate();
-}
@@ -1,18 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
-import { _ } from 'meteor/underscore';
-
-const fetchMethodNames = methods => _.pluck(methods, 'name');
-
-const assignLimits = ({ methods, limit, timeRange }) => {
-  const methodNames = fetchMethodNames(methods);
-
-  if (Meteor.isServer) {
-    DDPRateLimiter.addRule({
-      name(name) { return _.contains(methodNames, name); },
-      connectionId() { return true; },
-    }, limit, timeRange);
-  }
-};
-
-export default function rateLimit(options) { return assignLimits(options); }
@@ -0,0 +1,9 @@
+import '/imports/server/emails/config';
+import './accounts/email-templates';
+import './accounts/verifyEmail';
+import './accounts/login';
+import './accounts/resetPassword';
+import '/imports/server/emails/invite';
+import '/imports/server/pages/verifyEmail';
+
+import './accounts/creation';
@@ -2,22 +2,32 @@ import _                                  from &#39;lodash&#39;;
 import { Accounts }                       from 'meteor/accounts-base';
 import { SimpleSchema }                   from 'meteor/aldeed:simple-schema';
 import { ValidatedMethod }                from 'meteor/mdg:validated-method';
+
 import { Orgs }                           from '/imports/collections/orgs/index';
 import { Users }                          from '/imports/collections/users/index';
  
  
-
 Accounts.validateNewUser((user) => {
   return !!user;
 });
  
 Accounts.onCreateUser((options, user) => {
-  _.assign(user, {
-    firstName:    options.profile.firstName,
-    lastName:     options.profile.lastName,
-    phones:       [],
-    identities:   [],
-    createdAt:    new Date().getTime(),
-  });
-  return user;
+  if(options.orgSlug){
+    orgId = Orgs.insert({
+      slug:   options.orgSlug,
+      name:   options.orgName,
+      setup:  1,
+      users:  [{
+        userId:     user._id,
+        role:       Users.roles.ADMIN,
+      }],
+    });
+  }
+    _.assign(user, {
+      role:         Users.roles.ADMIN,
+      orgId:        orgId,
+      firstName:    options.profile.firstName,
+      lastName:     options.profile.lastName,
+    });
+    return user;
 });
@@ -0,0 +1,25 @@
+import { Accounts } from 'meteor/accounts-base';
+
+const name = 'Application Name';
+const email = '<support@application.com>';
+const from = `${name} ${email}`;
+const emailTemplates = Accounts.emailTemplates;
+
+emailTemplates.siteName = name;
+emailTemplates.from = from;
+
+emailTemplates.resetPassword = {
+  subject() {
+    return `[${name}] Reset Your Password`;
+  },
+  text(user, url) {
+    const userEmail = user.emails[0].address;
+    const urlWithoutHash = url.replace('#/', '');
+
+    return `A password reset has been requested for the account related to this
+    address (${userEmail}). To reset the password, visit the following link:
+    \n\n${urlWithoutHash}\n\n If you did not request this reset, please ignore
+    this email. If you feel something is wrong, please contact our support team:
+    ${email}.`;
+  },
+};
@@ -0,0 +1,6 @@
+Accounts.validateLoginAttempt(function (options) {
+   Meteor.call('method', true, function (error, result) {
+     // do nothing
+  });
+  return true
+});
@@ -0,0 +1,31 @@
+import _                                  from 'lodash';
+import { Accounts }                       from 'meteor/accounts-base';
+
+
+Accounts.emailTemplates.resetPassword = {
+  subject() {
+    return '[Blok8] Reset Your Password';
+  },
+  text(user, url) {
+    const userEmail = user.emails[0].address;
+    const theUrl = Meteor.absoluteUrl(`?enter=reset&token=${_.last(url.split('/'))}`);
+    // const theUrl = decodeURI(`\u003D`);
+
+    return (
+`
+Hello, ${user.firstName}!
+
+
+A password reset has been requested for the account related to this address.
+To reset the password, visit the following link:
+
+${theUrl}
+
+If you did not request this reset, please ignore this email.
+
+`
+    );
+  },
+};
+
+
@@ -0,0 +1,29 @@
+import _                                  from 'lodash';
+import { Accounts }                       from 'meteor/accounts-base';
+
+Accounts.config({
+  sendVerificationEmail: true
+});
+
+Accounts.emailTemplates.verifyEmail = {
+  subject() {
+    return '[YoungDesk] Verify Your Email Address';
+  },
+  text(user, url) {
+    const theUrl = Meteor.absoluteUrl(`back/verifyEmail/${_.last(url.split('/'))}`);
+
+    return (
+`
+Hello, ${user.firstName}!
+
+
+To verify your email address, visit the following link:
+
+${theUrl}
+
+If you did not request this verification, please ignore this email.
+
+`
+    );
+  },
+};
@@ -0,0 +1,14 @@
+import { BrowserPolicy } from 'meteor/browser-policy-common';
+// e.g., BrowserPolicy.content.allowOriginForAll( 's3.amazonaws.com' );
+BrowserPolicy.content.allowFontOrigin("data:");
+
+BrowserPolicy.content.disallowEval();
+
+BrowserPolicy.framing.allowAll();
+BrowserPolicy.content.allowInlineScripts();
+BrowserPolicy.content.allowInlineStyles();
+BrowserPolicy.content.allowSameOriginForAll();
+BrowserPolicy.content.allowDataUrlForAll();
+BrowserPolicy.content.allowOriginForAll('*');
+BrowserPolicy.content.allowOriginForAll('http://*');
+BrowserPolicy.content.allowOriginForAll('https://*');
@@ -0,0 +1,4 @@
+import '/imports/collections/orgs/publications'
+import '/imports/collections/orgs/methods';
+
+import '/imports/collections/users/publications';
@@ -0,0 +1,10 @@
+// process.env.MAIL_URL = "smtp://postmaster%40sandboxdac306638463443cb5d8adc4380ea78d.mailgun.org:9a2131ff0360b37dae90faca340e6b8f@smtp.mailgun.org:587";
+// process.env.MAIL_URL = "smtp://block8:cfxJfbe7xI7qfTgE2DB22g@smtp.mandrillapp.com:587";      /* Test Mode */
+
+import { Accounts }                       from 'meteor/accounts-base';
+
+if(Meteor.settings.public.environment === 'production') {
+  process.env.MAIL_URL = "smtp://block8:Ih-DuTSHlO-bdiPE7FBl3Q@smtp.mandrillapp.com:587";
+}
+Accounts.emailTemplates.siteName = 'YoungDesk';
+Accounts.emailTemplates.from     = 'YoungDesk <support@youngdesk.com>';
@@ -0,0 +1,166 @@
+import { Email } from 'meteor/email'
+import {moment} from 'meteor/momentjs:moment'
+moment.locale('en-au');
+
+export const sendInviteEmail = ({email, firstName, orgName, token}) => {
+  const url = Meteor.absoluteUrl(`invite/${token}`);
+  const text = `
+Hello, ${firstName}!
+
+You have been invited to join the ${orgName} on Blok8 wallet.
+To join, use the following link:
+
+${url}
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] Invitation to ${orgName}`,
+    text:     text,
+  });
+
+};
+
+export const sendChangeSharePriceEmail = ({orgName, firstName, lastName, price, email}) => {
+  const text = `
+Hi ${firstName},
+
+The current share price has been changed to $A${price} for the company ${orgName}.
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] Share price has changed for ${orgName}.`,
+    text:     text,
+  });
+
+};
+
+export const sendChangeNameEmail = ({firstName, lastName, email}) => {
+
+  console.log(firstName);
+  console.log(lastName);
+  console.log(email);
+  const text = `
+Hi ${firstName},
+
+Your name has been changed to "${firstName} ${lastName}".
+
+If you did not change your name, please reset your password.
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] - Name Change`,
+    text:     text,
+  });
+
+};
+
+export const sendChangePasswordEmail = ({firstName, lastName, email}) => {
+
+  console.log(firstName);
+  console.log(lastName);
+  console.log(email);
+  let date = moment().format('LLL');
+  const text = `
+Hi ${firstName},
+
+Your password was recently changed on ${date}.
+
+If you did not change your password, please reset your password immediately.
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] - Password Change`,
+    text:     text,
+  });
+
+};
+
+export const sendChangeEmail = ({firstName, lastName, email, newEmail}) => {
+
+  console.log(firstName);
+  console.log(lastName);
+  console.log(email);
+  let date = moment().format('LLL');
+  const text = `
+Hi ${firstName},
+
+Your email address  was recently changed on ${newEmail} on ${date}.
+
+If you did not change your email address, please contact us immediately by responding to this email.
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] - Email Change`,
+    text:     text,
+  });
+
+};
+
+
+export const sendIssueSharesEmail = ({orgName, firstName, lastName, quantity, purchasePrice, shareClass,email}) => {
+  console.log(quantity);
+  console.log(purchasePrice);
+  console.log(shareClass);
+  console.log(email);
+  const text = `
+Hi ${firstName},
+
+${quantity} ${shareClass} shares in ${orgName} have been issued to you for A$${purchasePrice} in total.
+
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] New shares have been issued to you in ${orgName}.`,
+    text:     text,
+  });
+
+};
+
+export const sendNewAnnouncementsEmail = ({orgId, orgName, createdByUser, title, description, uniqueUrl, firstName, lastName, email}) => {
+  const text = `
+Hi ${firstName},
+
+A new announcement has been issued by the company secretary!
+
+Title: ${title}.
+
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] ${orgName} - New Announcement`,
+    text:     text,
+  });
+
+};
+
+
+export const sendIssueDividendsEmail = ({ orgId, orgName, dividend, firstName, lastName, email }) => {
+  const text = `
+Hi ${firstName}!
+
+A new dividend has been issued at $A${dividend} per ordinary share for the company "${orgName}".
+
+`;
+
+  Email.send({
+    from:     'Blok 8 <support@mystake.io>',
+    to:       email,
+    subject:  `[Blok8] A new dividend has been issued by ${orgName}`,
+    text:     text,
+  });
+
+};
@@ -0,0 +1,23 @@
+import { Meteor } from 'meteor/meteor';
+import { Roles } from 'meteor/alanning:roles';
+import { Accounts } from 'meteor/accounts-base';
+
+if (!Meteor.isProduction) {
+  const users = [{
+    email: 'admin@admin.com',
+    password: 'password',
+    profile: {
+      name: { first: 'Carl', last: 'Winslow' },
+    },
+    roles: ['admin'],
+  }];
+
+  users.forEach(({ email, password, profile, roles }) => {
+    const userExists = Meteor.users.findOne({ 'emails.address': email });
+
+    if (!userExists) {
+      const userId = Accounts.createUser({ email, password, profile });
+      Roles.addUsersToRoles(userId, roles);
+    }
+  });
+}
@@ -0,0 +1,4 @@
+import './accounts';
+import './collections';
+import './browser-policy';
+import './fixtures';
@@ -0,0 +1,164 @@
+import React                              from 'react';
+import _                                  from 'lodash';
+import { Users }                          from '/imports/collections/users/index';
+
+
+
+
+const finishWithMessage = (res, message, redirect = "/") => {
+
+  const output = `
+<html>
+<head>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/simple-line-icons/2.4.1/css/simple-line-icons.css">
+<!-- Latest compiled and minified CSS -->
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+<style type="text/css">
+.congo-wrap .header {
+    background: #379AC7;
+    background: -webkit-linear-gradient(-90deg, #379AC7, #0460D9);
+    background: linear-gradient(180deg, #379AC7, #0460D9);
+    height: 80px;
+    padding: 11px 0;
+}
+        .logo img{
+            width:170px;
+        }
+.congo-wrap .header .container {
+    width: 100%;
+    padding:0 20px;
+}
+.congo-wrap{
+    background:#f6f7f7;
+    height:100%;
+}
+.widgetbox-congrats {
+    max-width: 720px;
+    margin: 0px auto;
+    background: #fff;
+    position: relative;
+    top: 20px;
+    text-align: center;
+    border: 1px solid #eee;
+        font-size: 20px;
+}
+
+body {
+    margin: 0;
+    padding: 0;
+}
+
+.widgetbox-congrats .congo-msg {
+    padding: 90px 0;
+    border-bottom: 1px solid #eee;
+}
+
+.widgetbox-congrats.congo-msg h4 {margin: 0 !important;padding: 0 !important;}
+
+.text-blue {
+    color: #0059ce;
+}
+
+.widgetbox-congrats .congo-msg h4 {
+    margin: 8px 0;
+    font-size: 24px;
+}
+
+.widgetbox-congrats .congo-msg .icon {
+   color: #0F67C8;
+    font-size: 90px;
+    font-weight: 100;
+    margin-bottom: 20px;
+    display: block;
+}
+
+.widgetbox-congrats .widgetbox-footer {
+    padding: 31px 10px;
+}
+
+.widgetbox-congrats .widgetbox-footer .btn {
+    background: #0e89d3;
+    color: #fff;
+    padding: 10px 30px;
+    text-transform: uppercase;
+}
+</style>
+
+</head>
+
+<body>
+<div class="congo-wrap">
+<div class="header">
+    <div class="container">
+        <div class="logo">
+           <img src="/files/images/svg/logo--white.svg" altt=""/>
+        </div>
+    </div>
+</div>
+    <div class="container">
+        <div class="widgetbox-congrats">
+            <div class="congo-msg">
+                <div class="text-blue">
+                    <i class="icon icon-simple icon-check"></i>
+                    <h4>Congrats!</h4>
+                </div>
+                <p> ${message}</p>
+            </div>
+            <div class="widgetbox-footer">
+                <a href="${redirect}" class="btn btn-lg btn-prmary">Continue</a>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+</html>
+  `;
+
+  res.writeHead(200, {
+    'Content-Length': output.length,
+    'Content-Type': 'text/html',
+  });
+  res.end(output);
+};
+
+
+
+Picker.route('/back/verifyEmail/:token', function(params, req, res, next) {
+
+  const user = Users.findOne({'services.email.verificationTokens.token': params.token});
+  if(!user) return finishWithMessage(res, 'Invalid or outdated token.');
+
+  const token = _.find(user.services.email.verificationTokens, x => x.token === params.token);
+  if(new Date().getTime() - token.when.getTime() > 2 * 24 * 60 * 60 * 1000) return finishWithMessage(res, 'Invalid or outdated token.');
+
+  finishWithMessage(res, 'Email has been verified.',"/");
+  const idx = _.findIndex(user.emails, x => x.address === token.address);
+
+  Users.update({_id: user._id}, {$set: {
+    [`emails.${idx}.verified`]: true,
+  }});
+
+
+
+
+// "services": {
+//     "password": {
+//       "bcrypt": "$2a$10$FqOvMve/MonERrLIOCJbruvS9iHoz5ixknGfm/ZAiOt9EiF43W4Z6"
+//     },
+//     "email": {
+//       "verificationTokens": [
+//         {
+//           "token": "05T-Ht_BzprDSAOVIYC-yUvDQ3Hp0wNym4eTx2g1VmI",
+//           "address": "krowa@druga.je",
+//           "when": new Date(1479502106631)
+//         }
+//       ]
+//     },
+
+
+
+
+
+
+});
@@ -1,35 +0,0 @@
-import _                                  from 'lodash';
-import { Accounts }                       from 'meteor/accounts-base';
-import { SimpleSchema }                   from 'meteor/aldeed:simple-schema';
-import { ValidatedMethod }                from 'meteor/mdg:validated-method';
-
-import { Orgs }                           from '/imports/collections/orgs/index';
-import { Users }                          from '/imports/collections/users/index';
-
-
-Accounts.validateNewUser((user) => {
-  return !!user;
-});
-
-Accounts.onCreateUser((options, user) => {
-  console.log(options);
-  if(options.orgSlug){
-    orgId = Orgs.insert({
-      slug:   options.orgSlug,
-      name:   options.orgName,
-      setup:  1,
-      users:  [{
-        userId:     user._id,
-        role:       Users.roles.ADMIN,
-      }],
-    });
-  }
-    console.log(user);
-    _.assign(user, {
-      role:         Users.roles.ADMIN,
-      orgId:        orgId,
-      firstName:    options.profile.firstName,
-      lastName:     options.profile.lastName,
-    });
-    return user;
-});
@@ -1,25 +0,0 @@
-import { Accounts } from 'meteor/accounts-base';
-
-const name = 'Application Name';
-const email = '<support@application.com>';
-const from = `${name} ${email}`;
-const emailTemplates = Accounts.emailTemplates;
-
-emailTemplates.siteName = name;
-emailTemplates.from = from;
-
-emailTemplates.resetPassword = {
-  subject() {
-    return `[${name}] Reset Your Password`;
-  },
-  text(user, url) {
-    const userEmail = user.emails[0].address;
-    const urlWithoutHash = url.replace('#/', '');
-
-    return `A password reset has been requested for the account related to this
-    address (${userEmail}). To reset the password, visit the following link:
-    \n\n${urlWithoutHash}\n\n If you did not request this reset, please ignore
-    this email. If you feel something is wrong, please contact our support team:
-    ${email}.`;
-  },
-};
@@ -1,31 +0,0 @@
-import _                                  from 'lodash';
-import { Accounts }                       from 'meteor/accounts-base';
-
-
-Accounts.emailTemplates.resetPassword = {
-  subject() {
-    return '[Blok8] Reset Your Password';
-  },
-  text(user, url) {
-    const userEmail = user.emails[0].address;
-    const theUrl = Meteor.absoluteUrl(`?enter=reset&token=${_.last(url.split('/'))}`);
-    // const theUrl = decodeURI(`\u003D`);
-
-    return (
-`
-Hello, ${user.firstName}!
-
-
-A password reset has been requested for the account related to this address.
-To reset the password, visit the following link:
-
-${theUrl}
-
-If you did not request this reset, please ignore this email.
-
-`
-    );
-  },
-};
-
-
@@ -1,29 +0,0 @@
-import _                                  from 'lodash';
-import { Accounts }                       from 'meteor/accounts-base';
-
-Accounts.config({
-  sendVerificationEmail: true
-});
-
-Accounts.emailTemplates.verifyEmail = {
-  subject() {
-    return '[Blok8] Verify Your Email Address';
-  },
-  text(user, url) {
-    const theUrl = Meteor.absoluteUrl(`back/verifyEmail/${_.last(url.split('/'))}`);
-
-    return (
-`
-Hello, ${user.firstName}!
-
-
-To verify your email address, visit the following link:
-
-${theUrl}
-
-If you did not request this verification, please ignore this email.
-
-`
-    );
-  },
-};
@@ -1,7 +0,0 @@
-import '../../api/documents/methods.js';
-import '../../api/documents/server/publications.js';
-
-import '/imports/collections/orgs/publications'
-import '/imports/collections/orgs/methods';
-
-import '/imports/collections/users/publications';
@@ -1,14 +0,0 @@
-import { BrowserPolicy } from 'meteor/browser-policy-common';
-// e.g., BrowserPolicy.content.allowOriginForAll( 's3.amazonaws.com' );
-BrowserPolicy.content.allowFontOrigin("data:");
-
-BrowserPolicy.content.disallowEval();
-
-BrowserPolicy.framing.allowAll();
-BrowserPolicy.content.allowInlineScripts();
-BrowserPolicy.content.allowInlineStyles();
-BrowserPolicy.content.allowSameOriginForAll();
-BrowserPolicy.content.allowDataUrlForAll();
-BrowserPolicy.content.allowOriginForAll('*');
-BrowserPolicy.content.allowOriginForAll('http://*');
-BrowserPolicy.content.allowOriginForAll('https://*');
@@ -1,23 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Roles } from 'meteor/alanning:roles';
-import { Accounts } from 'meteor/accounts-base';
-
-if (!Meteor.isProduction) {
-  const users = [{
-    email: 'admin@admin.com',
-    password: 'password',
-    profile: {
-      name: { first: 'Carl', last: 'Winslow' },
-    },
-    roles: ['admin'],
-  }];
-
-  users.forEach(({ email, password, profile, roles }) => {
-    const userExists = Meteor.users.findOne({ 'emails.address': email });
-
-    if (!userExists) {
-      const userId = Accounts.createUser({ email, password, profile });
-      Roles.addUsersToRoles(userId, roles);
-    }
-  });
-}
@@ -1,5 +0,0 @@
-import './accounts/email-templates';
-import './accounts/creation';
-import './browser-policy';
-import './fixtures';
-import './api';
@@ -1,25 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router';
-import { Row, Col, Button } from 'react-bootstrap';
-import DocumentsList from '../containers/DocumentsList.js';
-
-const Documents = () => (
-  <div className="Documents">
-    <Row>
-      <Col xs={ 12 }>
-        <div className="page-header clearfix">
-          <h4 className="pull-left">Documents</h4>
-          <Link to="/documents/new">
-            <Button
-              bsStyle="success"
-              className="pull-right"
-            >New Document</Button>
-          </Link>
-        </div>
-        <DocumentsList />
-      </Col>
-    </Row>
-  </div>
-);
-
-export default Documents;
@@ -1,15 +0,0 @@
-import React from 'react';
-import DocumentEditor from '../components/DocumentEditor.js';
-
-const EditDocument = ({ doc }) => (
-  <div className="EditDocument">
-    <h4 className="page-header">Editing "{ doc.title }"</h4>
-    <DocumentEditor doc={ doc } />
-  </div>
-);
-
-EditDocument.propTypes = {
-  doc: React.PropTypes.object,
-};
-
-export default EditDocument;
@@ -1,54 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router';
-import { Row, Col, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
-import handleLogin from '../../modules/login';
-
-export default class Login extends React.Component {
-  componentDidMount() {
-    handleLogin({ component: this });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <div className="Login">
-        <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
-            <h4 className="page-header">Login</h4>
-            <form
-              ref={ form => (this.loginForm = form) }
-              className="login"
-              onSubmit={ this.handleSubmit }
-            >
-              <FormGroup>
-                <ControlLabel>Email Address</ControlLabel>
-                <FormControl
-                  type="email"
-                  ref="emailAddress"
-                  name="emailAddress"
-                  placeholder="Email Address"
-                />
-              </FormGroup>
-              <FormGroup>
-                <ControlLabel>
-                  <span className="pull-left">Password</span>
-                  <Link className="pull-right" to="/recover-password">Forgot Password?</Link>
-                </ControlLabel>
-                <FormControl
-                  type="password"
-                  ref="password"
-                  name="password"
-                  placeholder="Password"
-                />
-              </FormGroup>
-              <Button type="submit" bsStyle="success">Login</Button>
-            </form>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
@@ -1,11 +0,0 @@
-import React from 'react';
-import DocumentEditor from '../components/DocumentEditor.js';
-
-const NewDocument = () => (
-  <div className="NewDocument">
-    <h4 className="page-header">New Document</h4>
-    <DocumentEditor />
-  </div>
-);
-
-export default NewDocument;
@@ -1,43 +0,0 @@
-import React from 'react';
-import { Row, Col, Alert, FormGroup, FormControl, Button } from 'react-bootstrap';
-import handleRecoverPassword from '../../modules/recover-password';
-
-export default class RecoverPassword extends React.Component {
-  componentDidMount() {
-    handleRecoverPassword({ component: this });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <div className="RecoverPassword">
-        <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
-            <h4 className="page-header">Recover Password</h4>
-            <Alert bsStyle="info">
-              Enter your email address below to receive a link to reset your password.
-            </Alert>
-            <form
-              ref={ form => (this.recoverPasswordForm = form) }
-              className="recover-password"
-              onSubmit={ this.handleSubmit }
-            >
-              <FormGroup>
-                <FormControl
-                  type="email"
-                  ref="emailAddress"
-                  name="emailAddress"
-                  placeholder="Email Address"
-                />
-              </FormGroup>
-              <Button type="submit" bsStyle="success">Recover Password</Button>
-            </form>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
@@ -1,58 +0,0 @@
-import React from 'react';
-import { Row, Col, Alert, FormGroup, ControlLabel, FormControl, Button } from 'react-bootstrap';
-import handleResetPassword from '../../modules/reset-password';
-
-export default class ResetPassword extends React.Component {
-  componentDidMount() {
-    handleResetPassword({ component: this, token: this.props.params.token });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <div className="ResetPassword">
-        <Row>
-          <Col xs={ 12 } sm={ 6 } md={ 4 }>
-            <h4 className="page-header">Reset Password</h4>
-            <Alert bsStyle="info">
-              To reset your password, enter a new one below. You will be logged in
-    with your new password.
-            </Alert>
-            <form
-              ref={ form => (this.resetPasswordForm = form) }
-              className="reset-password"
-              onSubmit={ this.handleSubmit }
-            >
-              <FormGroup>
-                <ControlLabel>New Password</ControlLabel>
-                <FormControl
-                  type="password"
-                  ref="newPassword"
-                  name="newPassword"
-                  placeholder="New Password"
-                />
-              </FormGroup>
-              <FormGroup>
-                <ControlLabel>Repeat New Password</ControlLabel>
-                <FormControl
-                  type="password"
-                  ref="repeatNewPassword"
-                  name="repeatNewPassword"
-                  placeholder="Repeat New Password"
-                />
-              </FormGroup>
-              <Button type="submit" bsStyle="success">Reset Password &amp; Login</Button>
-            </form>
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
-
-ResetPassword.propTypes = {
-  params: React.PropTypes.object,
-};
@@ -1,43 +0,0 @@
-import React from 'react';
-import { ButtonToolbar, ButtonGroup, Button } from 'react-bootstrap';
-import { browserHistory } from 'react-router';
-import { Bert } from 'meteor/themeteorchef:bert';
-import { removeDocument } from '../../api/documents/methods.js';
-
-const handleEdit = (_id) => {
-  browserHistory.push(`/documents/${_id}/edit`);
-}
-
-const handleRemove = (_id) => {
-  if (confirm('Are you sure? This is permanent!')) {
-    removeDocument.call({ _id }, (error) => {
-      if (error) {
-        Bert.alert(error.reason, 'danger');
-      } else {
-        Bert.alert('Document deleted!', 'success');
-        browserHistory.push('/documents');
-      }
-    });
-  }
-};
-
-const ViewDocument = ({ doc }) => (
-  <div className="ViewDocument">
-    <div className="page-header clearfix">
-      <h4 className="pull-left">{ doc && doc.title }</h4>
-      <ButtonToolbar className="pull-right">
-        <ButtonGroup bsSize="small">
-          <Button onClick={ () => handleEdit(doc._id) }>Edit</Button>
-          <Button onClick={ () => handleRemove(doc._id) } className="text-danger">Delete</Button>
-        </ButtonGroup>
-      </ButtonToolbar>
-    </div>
-    { doc && doc.body }
-  </div>
-);
-
-ViewDocument.propTypes = {
-  doc: React.PropTypes.object,
-};
-
-export default ViewDocument;
-import '/imports/startup/server';
+import '/imports/server/index';
...	...	@@ -16,7 +16,7 @@ standard-minifier-js@1.2.2 # JS minifier run for production mode
16	16	es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
17	17	ecmascript@0.6.3 # Enable ECMAScript2015+ syntax in app code
18	18
19		-accounts-password@1.3.4
	19	+accounts-password
20	20	accounts-base@1.2.14
21	21	check
22	22	audit-argument-checks@1.0.7
...	...	@@ -35,3 +35,5 @@ dburles:factory@1.0.0
35	35	ddp-rate-limiter@1.0.6
36	36	shell-server@0.2.2
37	37	aldeed:simple-schema
	38	+momentjs:moment
	39	+meteorhacks:picker
...	...
...	...	@@ -56,6 +56,7 @@ mdg:validated-method@1.1.0
56	56	mdg:validation-error@0.5.1
57	57	meteor@1.6.1
58	58	meteor-base@1.0.4
	59	+meteorhacks:picker@1.0.3
59	60	minifier-css@1.2.16
60	61	minifier-js@1.2.18
61	62	minimongo@1.0.20
...	...	@@ -63,6 +64,7 @@ mobile-experience@1.0.4
63	64	mobile-status-bar@1.0.14
64	65	modules@0.7.9
65	66	modules-runtime@0.7.9
	67	+momentjs:moment@2.17.1
66	68	mongo@1.1.15
67	69	mongo-id@1.0.6
68	70	npm-bcrypt@0.9.2
...	...
...	...	@@ -1,36 +0,0 @@
1		-import { Mongo } from 'meteor/mongo';
2		-import { SimpleSchema } from 'meteor/aldeed:simple-schema';
3		-import { Factory } from 'meteor/dburles:factory';
4		-
5		-const Documents = new Mongo.Collection('Documents');
6		-export default Documents;
7		-
8		-Documents.allow({
9		- insert: () => false,
10		- update: () => false,
11		- remove: () => false,
12		-});
13		-
14		-Documents.deny({
15		- insert: () => true,
16		- update: () => true,
17		- remove: () => true,
18		-});
19		-
20		-Documents.schema = new SimpleSchema({
21		- title: {
22		- type: String,
23		- label: 'The title of the document.',
24		- },
25		- body: {
26		- type: String,
27		- label: 'The body of the document.',
28		- },
29		-});
30		-
31		-Documents.attachSchema(Documents.schema);
32		-
33		-Factory.define('document', Documents, {
34		- title: () => 'Factory Title',
35		- body: () => 'Factory Body',
36		-});
...	...	@@ -1,11 +0,0 @@
1		-/* eslint-env mocha */
2		-/* eslint-disable func-names, prefer-arrow-callback */
3		-
4		-import { assert } from 'meteor/practicalmeteor:chai';
5		-import Documents from './documents.js';
6		-
7		-describe('Documents collection', function () {
8		- it('registers the collection with Mongo properly', function () {
9		- assert.equal(typeof Documents, 'object');
10		- });
11		-});
...	...	@@ -1,35 +0,0 @@
1		-import { SimpleSchema } from 'meteor/aldeed:simple-schema';
2		-import { ValidatedMethod } from 'meteor/mdg:validated-method';
3		-import Documents from './documents';
4		-import rateLimit from '../../modules/rate-limit.js';
5		-
6		-export const upsertDocument = new ValidatedMethod({
7		- name: 'documents.upsert',
8		- validate: new SimpleSchema({
9		- _id: { type: String, optional: true },
10		- title: { type: String, optional: true },
11		- body: { type: String, optional: true },
12		- }).validator(),
13		- run(document) {
14		- return Documents.upsert({ _id: document._id }, { $set: document });
15		- },
16		-});
17		-
18		-export const removeDocument = new ValidatedMethod({
19		- name: 'documents.remove',
20		- validate: new SimpleSchema({
21		- _id: { type: String },
22		- }).validator(),
23		- run({ _id }) {
24		- Documents.remove(_id);
25		- },
26		-});
27		-
28		-rateLimit({
29		- methods: [
30		- upsertDocument,
31		- removeDocument,
32		- ],
33		- limit: 5,
34		- timeRange: 1000,
35		-});
...	...	@@ -1,47 +0,0 @@
1		-/* eslint-env mocha */
2		-/* eslint-disable func-names, prefer-arrow-callback */
3		-
4		-import { Meteor } from 'meteor/meteor';
5		-import { assert } from 'meteor/practicalmeteor:chai';
6		-import { resetDatabase } from 'meteor/xolvio:cleaner';
7		-import { Factory } from 'meteor/dburles:factory';
8		-import Documents from './documents.js';
9		-import { upsertDocument, removeDocument } from './methods.js';
10		-
11		-describe('Documents methods', function () {
12		- beforeEach(function () {
13		- if (Meteor.isServer) {
14		- resetDatabase();
15		- }
16		- });
17		-
18		- it('inserts a document into the Documents collection', function () {
19		- upsertDocument.call({
20		- title: 'You can\'t arrest me, I\'m the Cake Boss!',
21		- body: 'They went nuts!',
22		- });
23		-
24		- const getDocument = Documents.findOne({ title: 'You can\'t arrest me, I\'m the Cake Boss!' });
25		- assert.equal(getDocument.body, 'They went nuts!');
26		- });
27		-
28		- it('updates a document in the Documents collection', function () {
29		- const { _id } = Factory.create('document');
30		-
31		- upsertDocument.call({
32		- _id,
33		- title: 'You can\'t arrest me, I\'m the Cake Boss!',
34		- body: 'They went nuts!',
35		- });
36		-
37		- const getDocument = Documents.findOne(_id);
38		- assert.equal(getDocument.title, 'You can\'t arrest me, I\'m the Cake Boss!');
39		- });
40		-
41		- it('removes a document from the Documents collection', function () {
42		- const { _id } = Factory.create('document');
43		- removeDocument.call({ _id });
44		- const getDocument = Documents.findOne(_id);
45		- assert.equal(getDocument, undefined);
46		- });
47		-});
...	...	@@ -1,10 +0,0 @@
1		-import { Meteor } from 'meteor/meteor';
2		-import { check } from 'meteor/check';
3		-import Documents from '../documents';
4		-
5		-Meteor.publish('documents.list', () => Documents.find());
6		-
7		-Meteor.publish('documents.view', (_id) => {
8		- check(_id, String);
9		- return Documents.find(_id);
10		-});
...	...	@@ -48,7 +48,7 @@ const detectOrg = () => {
48	48	if(orgSlug!=""){
49	49	Meteor.call('checkExistingOrg', {slug:orgSlug}, function(err, res) {
50	50	if(res){
51		- Session.set('orgId', res._id._str);
	51	+ Session.set('orgId', res._id);
52	52	Session.set('orgSlug', orgSlug);
53	53	render(getOrgRoutes(),document.getElementById('app'));
54	54	}else{
...	...
...	...	@@ -2,7 +2,7 @@
2	2	font-family: 'icomoon';
3	3	src:url('fonts/icomoon.eot?3p0rtw');
4	4	src:url('fonts/icomoon.eot?#iefix3p0rtw') format('embedded-opentype'),
5		- url('fonts/icomoon.woff?3p0rtw') format('font-woff'),
	5	+ url('fonts/icomoon.woff?3p0rtw') format('woff'),
6	6	url('fonts/icomoon.ttf?3p0rtw') format('truetype'),
7	7	url('fonts/icomoon.svg?3p0rtw#icomoon') format('svg');
8	8	font-weight: normal;
...	...
...	...	@@ -18,7 +18,7 @@ render(){
18	18	var signup = `http://${mainSite}/signup`;
19	19	return(
20	20	<Nav pullRight>
21		- <LinkContainer to={ setQueryParam(this.props.location, { enter: 'login' }) }>
	21	+ <LinkContainer to="login">
22	22	<NavItem eventKey={ 2 } href="/login">Log In</NavItem>
23	23	</LinkContainer>
24	24	</Nav>
...	...