Fix index issue
This commit is contained in:
@@ -21,7 +21,7 @@
|
|||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>20180413.0</string>
|
<string>20180413.1</string>
|
||||||
<key>LSRequiresIPhoneOS</key>
|
<key>LSRequiresIPhoneOS</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>NSAppTransportSecurity</key>
|
<key>NSAppTransportSecurity</key>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export const versionInfo = {
|
export const versionInfo = {
|
||||||
version: '1.0.0',
|
version: '1.0.0',
|
||||||
fullVersion: '1.0.0-20180413.0',
|
fullVersion: '1.0.0-20180413.1',
|
||||||
title: 'Deighton AR System',
|
title: 'Deighton AR System',
|
||||||
copyright: '© 2018, Kingston Software Solutions.',
|
copyright: '© 2018, Kingston Software Solutions.',
|
||||||
supportEmail: 'support@kss.us.com',
|
supportEmail: 'support@kss.us.com',
|
||||||
|
|||||||
@@ -1,38 +1,62 @@
|
|||||||
import { Schema } from 'mongoose'
|
import { Schema } from "mongoose"
|
||||||
import { regExpPattern } from 'regexp-pattern'
|
import { regExpPattern } from "regexp-pattern"
|
||||||
|
|
||||||
export let userSchema = new Schema({
|
export let userSchema = new Schema(
|
||||||
|
{
|
||||||
_id: { type: Schema.Types.ObjectId, required: true, auto: true },
|
_id: { type: Schema.Types.ObjectId, required: true, auto: true },
|
||||||
loginToken: { type: String, index: true, unique: true, sparse: true },
|
loginToken: {
|
||||||
|
type: String,
|
||||||
|
index: true,
|
||||||
|
unique: true,
|
||||||
|
partialFilterExpression: { loginToken: { $type: "string" } },
|
||||||
|
},
|
||||||
passwordHash: {
|
passwordHash: {
|
||||||
type: {
|
type: {
|
||||||
hash: String,
|
hash: String,
|
||||||
salt: String,
|
salt: String,
|
||||||
keyLength: Number,
|
keyLength: Number,
|
||||||
hashMethod: String,
|
hashMethod: String,
|
||||||
iterations: Number
|
iterations: Number,
|
||||||
}
|
},
|
||||||
|
},
|
||||||
|
email: {
|
||||||
|
type: String,
|
||||||
|
match: regExpPattern.email,
|
||||||
|
required: true,
|
||||||
|
index: true,
|
||||||
|
unique: true,
|
||||||
},
|
},
|
||||||
email: { type: String, match: regExpPattern.email, required: true, index: true, unique: true },
|
|
||||||
newEmail: { type: String, match: regExpPattern.email },
|
newEmail: { type: String, match: regExpPattern.email },
|
||||||
thumbnailImageId: { type: Schema.Types.ObjectId },
|
thumbnailImageId: { type: Schema.Types.ObjectId },
|
||||||
emailToken: {
|
emailToken: {
|
||||||
type: {
|
type: {
|
||||||
value: { type: String, index: true, unique: true, sparse: true },
|
value: {
|
||||||
created: Date
|
type: String,
|
||||||
}
|
index: true,
|
||||||
|
unique: true,
|
||||||
|
partialFilterExpression: { emailToken: { $type: "string" } },
|
||||||
|
},
|
||||||
|
created: Date,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
passwordToken: {
|
passwordToken: {
|
||||||
type: {
|
type: {
|
||||||
value: { type: String, index: true, unique: true, sparse: true },
|
value: {
|
||||||
created: Date
|
type: String,
|
||||||
}
|
index: true,
|
||||||
|
unique: true,
|
||||||
|
partialFilterExpression: { passwordToken: { $type: "string" } },
|
||||||
|
},
|
||||||
|
created: Date,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
firstName: { type: String, required: true },
|
firstName: { type: String, required: true },
|
||||||
lastName: { type: String, required: true },
|
lastName: { type: String, required: true },
|
||||||
administrator: { type: Boolean, required: true },
|
administrator: { type: Boolean, required: true },
|
||||||
team: Schema.Types.ObjectId,
|
team: Schema.Types.ObjectId,
|
||||||
}, { timestamps: true, id: false })
|
},
|
||||||
|
{ timestamps: true, id: false }
|
||||||
|
)
|
||||||
|
|
||||||
userSchema.methods.toClient = function(authUser) {
|
userSchema.methods.toClient = function(authUser) {
|
||||||
if (!authUser) {
|
if (!authUser) {
|
||||||
@@ -42,13 +66,13 @@ userSchema.methods.toClient = function(authUser) {
|
|||||||
let user = {
|
let user = {
|
||||||
_id: this._id,
|
_id: this._id,
|
||||||
email: this.email,
|
email: this.email,
|
||||||
emailValidated: (!!this.emailToken !== true),
|
emailValidated: !!this.emailToken !== true,
|
||||||
imageId: this.imageId,
|
imageId: this.imageId,
|
||||||
thumbnailImageId: this.thumbnailImageId,
|
thumbnailImageId: this.thumbnailImageId,
|
||||||
firstName: this.firstName,
|
firstName: this.firstName,
|
||||||
lastName: this.lastName,
|
lastName: this.lastName,
|
||||||
administrator: this.administrator,
|
administrator: this.administrator,
|
||||||
team: this.team
|
team: this.team,
|
||||||
}
|
}
|
||||||
|
|
||||||
return user
|
return user
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
minor: 0,
|
minor: 0,
|
||||||
patch: 0,
|
patch: 0,
|
||||||
build: 20180413,
|
build: 20180413,
|
||||||
revision: 0,
|
revision: 1,
|
||||||
sequence: 1,
|
sequence: 1,
|
||||||
tz: "America/Los_Angeles",
|
tz: "America/Los_Angeles",
|
||||||
title: "Deighton AR System",
|
title: "Deighton AR System",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export const versionInfo = {
|
export const versionInfo = {
|
||||||
version: '1.0.0',
|
version: '1.0.0',
|
||||||
fullVersion: '1.0.0-20180413.0',
|
fullVersion: '1.0.0-20180413.1',
|
||||||
title: 'Deighton AR System',
|
title: 'Deighton AR System',
|
||||||
copyright: '© 2018, Kingston Software Solutions.',
|
copyright: '© 2018, Kingston Software Solutions.',
|
||||||
supportEmail: 'support@kss.us.com',
|
supportEmail: 'support@kss.us.com',
|
||||||
|
|||||||
Reference in New Issue
Block a user