on master help sign in
jslib as a submodule
commit3f1e121c9ceccc2d4c178df738b07b8e8551e126 authorKyle Spearrin <kyle.spearrin@gmail.com> dateMon 19 Feb 2018, 16:06 (9 years ago) parent70f8f2f
8 files changed+17−74
.gitmodules+4 jslib+1 jslib.ts−59 package-lock.json+6−11 package.json+3−1 tsconfig.json+1−1 webpack.main.js+1−1 webpack.renderer.js+1−1
.gitmodulesnew file+4
@@ -0,0 +1,4 @@
1+[submodule "jslib"]
2+ path = jslib
3+ url = git@github.com:bitwarden/jslib.git
4+ branch = master
jslibnew file+1

Submodule changed.

jslib.tsdeleted−59
@@ -1,59 +0,0 @@
1−import { CipherType } from 'jslib/enums/cipherType';
2−import { DeviceType } from 'jslib/enums/deviceType';
3−import { EncryptionType } from 'jslib/enums/encryptionType';
4−import { FieldType } from 'jslib/enums/fieldType';
5−import { SecureNoteType } from 'jslib/enums/secureNoteType';
6−import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType';
7−
8−import { AttachmentData } from 'jslib/models/data/attachmentData';
9−import { CardData } from 'jslib/models/data/cardData';
10−import { CipherData } from 'jslib/models/data/cipherData';
11−import { CollectionData } from 'jslib/models/data/collectionData';
12−import { FieldData } from 'jslib/models/data/fieldData';
13−import { FolderData } from 'jslib/models/data/folderData';
14−import { IdentityData } from 'jslib/models/data/identityData';
15−import { LoginData } from 'jslib/models/data/loginData';
16−import { SecureNoteData } from 'jslib/models/data/secureNoteData';
17−
18−import { Attachment } from 'jslib/models/domain/attachment';
19−import { AuthResult } from 'jslib/models/domain/authResult';
20−import { Card } from 'jslib/models/domain/card';
21−import { Cipher } from 'jslib/models/domain/cipher';
22−import { CipherString } from 'jslib/models/domain/cipherString';
23−import { Collection } from 'jslib/models/domain/collection';
24−import Domain from 'jslib/models/domain/domain';
25−import { EncryptedObject } from 'jslib/models/domain/encryptedObject';
26−import { EnvironmentUrls } from 'jslib/models/domain/environmentUrls';
27−import { Field } from 'jslib/models/domain/field';
28−import { Folder } from 'jslib/models/domain/folder';
29−import { Identity } from 'jslib/models/domain/identity';
30−import { Login } from 'jslib/models/domain/login';
31−import { PasswordHistory } from 'jslib/models/domain/passwordHistory';
32−import { SecureNote } from 'jslib/models/domain/secureNote';
33−import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey';
34−import { SymmetricCryptoKeyBuffers } from 'jslib/models/domain/symmetricCryptoKeyBuffers';
35−
36−import { CipherRequest } from 'jslib/models/request/cipherRequest';
37−import { DeviceRequest } from 'jslib/models/request/deviceRequest';
38−import { DeviceTokenRequest } from 'jslib/models/request/deviceTokenRequest';
39−import { FolderRequest } from 'jslib/models/request/folderRequest';
40−import { PasswordHintRequest } from 'jslib/models/request/passwordHintRequest';
41−import { RegisterRequest } from 'jslib/models/request/registerRequest';
42−import { TokenRequest } from 'jslib/models/request/tokenRequest';
43−import { TwoFactorEmailRequest } from 'jslib/models/request/twoFactorEmailRequest';
44−
45−import { AttachmentResponse } from 'jslib/models/response/attachmentResponse';
46−import { CipherResponse } from 'jslib/models/response/cipherResponse';
47−import { CollectionResponse } from 'jslib/models/response/collectionResponse';
48−import { DeviceResponse } from 'jslib/models/response/deviceResponse';
49−import { DomainsResponse } from 'jslib/models/response/domainsResponse';
50−import { ErrorResponse } from 'jslib/models/response/errorResponse';
51−import { FolderResponse } from 'jslib/models/response/folderResponse';
52−import { GlobalDomainResponse } from 'jslib/models/response/globalDomainResponse';
53−import { IdentityTokenResponse } from 'jslib/models/response/identityTokenResponse';
54−import { IdentityTwoFactorResponse } from 'jslib/models/response/identityTwoFactorResponse';
55−import { KeysResponse } from 'jslib/models/response/keysResponse';
56−import { ListResponse } from 'jslib/models/response/listResponse';
57−import { ProfileOrganizationResponse } from 'jslib/models/response/profileOrganizationResponse';
58−import { ProfileResponse } from 'jslib/models/response/profileResponse';
59−import { SyncResponse } from 'jslib/models/response/syncResponse';
package-lock.json+6−11
@@ -116,14 +116,6 @@
116116 "tslib": "1.8.1"
117117 }
118118 },
119− "@bitwarden/jslib": {
120− "version": "git+https://github.com/bitwarden/jslib.git#5b63336347ad9597ed65d907b1bdb804d8b4f39a",
121− "requires": {
122− "@types/node-forge": "0.7.1",
123− "@types/webcrypto": "0.0.28",
124− "node-forge": "0.7.1"
125− }
126− },
127119 "@types/keytar": {
128120 "version": "4.0.1",
129121 "resolved": "https://registry.npmjs.org/@types/keytar/-/keytar-4.0.1.tgz",
@@ -139,12 +131,14 @@
139131 "@types/node-forge": {
140132 "version": "0.7.1",
141133 "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-0.7.1.tgz",
142− "integrity": "sha512-sXCLq42I8Evd/qnrSluSKwxuBc2ioPvNCvb5hl+VL3d2zlh45n26b3rPf8DuJiAuJSv5Z5cqcF1KL7X77tXG4Q=="
134+ "integrity": "sha512-sXCLq42I8Evd/qnrSluSKwxuBc2ioPvNCvb5hl+VL3d2zlh45n26b3rPf8DuJiAuJSv5Z5cqcF1KL7X77tXG4Q==",
135+ "dev": true
143136 },
144137 "@types/webcrypto": {
145138 "version": "0.0.28",
146139 "resolved": "https://registry.npmjs.org/@types/webcrypto/-/webcrypto-0.0.28.tgz",
147− "integrity": "sha512-jzAoSUvqA+183nJO/Sc73CREQJsv+p77WJdn532GqA3YXQzlwRwHhClVa7U4O8iB2sJSR7G3v6f1mJFNkwA9YQ=="
140+ "integrity": "sha512-jzAoSUvqA+183nJO/Sc73CREQJsv+p77WJdn532GqA3YXQzlwRwHhClVa7U4O8iB2sJSR7G3v6f1mJFNkwA9YQ==",
141+ "dev": true
148142 },
149143 "abbrev": {
150144 "version": "1.1.1",
@@ -3578,7 +3572,8 @@
35783572 "jsbn": {
35793573 "version": "0.1.1",
35803574 "bundled": true,
3581− "dev": true
3575+ "dev": true,
3576+ "optional": true
35823577 },
35833578 "json-schema": {
35843579 "version": "0.2.3",
package.json+3−1
@@ -114,6 +114,8 @@
114114 },
115115 "devDependencies": {
116116 "@types/keytar": "^4.0.1",
117+ "@types/node-forge": "0.7.1",
118+ "@types/webcrypto": "0.0.28",
117119 "clean-webpack-plugin": "^0.1.17",
118120 "copy-webpack-plugin": "^4.2.0",
119121 "css-loader": "^0.28.7",
@@ -150,7 +152,6 @@
150152 "@angular/platform-browser-dynamic": "5.2.0",
151153 "@angular/router": "5.2.0",
152154 "@angular/upgrade": "5.2.0",
153− "@bitwarden/jslib": "git+https://github.com/bitwarden/jslib.git",
154155 "angular2-toaster": "4.0.2",
155156 "angulartics2": "5.0.1",
156157 "core-js": "2.4.1",
@@ -158,6 +159,7 @@
158159 "electron-store": "1.3.0",
159160 "electron-updater": "2.20.1",
160161 "keytar": "4.1.0",
162+ "node-forge": "0.7.1",
161163 "rxjs": "5.5.6",
162164 "zone.js": "0.8.19"
163165 }
tsconfig.json+1−1
@@ -11,7 +11,7 @@
1111 "types": [],
1212 "baseUrl": ".",
1313 "paths": {
14− "jslib/*": [ "node_modules/@bitwarden/jslib/src/*" ]
14+ "jslib/*": [ "jslib/src/*" ]
1515 }
1616 },
1717 "exclude": [
webpack.main.js+1−1
@@ -24,7 +24,7 @@ const common = {
2424 resolve: {
2525 extensions: ['.tsx', '.ts', '.js'],
2626 alias: {
27− jslib: path.join(__dirname, 'node_modules/@bitwarden/jslib/src')
27+ jslib: path.join(__dirname, 'jslib/src')
2828 }
2929 },
3030 output: {
webpack.renderer.js+1−1
@@ -51,7 +51,7 @@ const common = {
5151 resolve: {
5252 extensions: ['.tsx', '.ts', '.js'],
5353 alias: {
54− jslib: path.join(__dirname, 'node_modules/@bitwarden/jslib/src')
54+ jslib: path.join(__dirname, 'jslib/src')
5555 }
5656 },
5757 output: {