Skip to content
This repository was archived by the owner on Jun 26, 2020. It is now read-only.

Commit ee9d19b

Browse files
vovavova
vova
authored and
vova
committed
Added AWS licensing and small ui modifications
1 parent 40ebdc0 commit ee9d19b

20 files changed

+454
-270
lines changed

‎LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Cognito Quickstart
2+
===================================================
3+
4+
### What does this app do?
5+
6+
7+
8+
### Getting the code
9+
```
10+
git clone --depth 1 <repo_url>
11+
```
12+
13+
### The code
14+
#### Prerequisites

‎bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"node_modules",
1010
"bower_components",
1111
"test",
12-
"tests"
12+
"tests",
13+
"src"
1314
],
1415
"dependencies": {
1516
"bootstrap": "^3.3.6",

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "awscognito-angular2",
3+
"author": "Vladimir Budilov",
34
"version": "0.0.0",
45
"license": "MIT",
56
"angular-cli": {},

‎src/app/app.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ import {HomeComponent} from "./home.component";
1111
directives: [ROUTER_DIRECTIVES]
1212
})
1313
@Routes([
14-
// {path: '/...', component: HomeComponent},
14+
{path: '/', component: HomeComponent},
1515
{path: '/home', component: HomeComponent},
1616
{path: '/securehome', component: SecureHomeComponent}
1717
])
1818
export class AppComponent {
1919

2020
constructor(private router:Router) {
2121
console.log("In the AppComponent");
22-
this.router.navigate(['/home']);
22+
// this.router.navigate(['/home']);
2323
}
2424

25-
2625
}

‎src/app/home.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class AboutComponent {
2424
directives: [ROUTER_DIRECTIVES]
2525
})
2626
@Routes([
27+
{path: '/', component: LoginComponent},
2728
{path: '/about', component: AboutComponent},
2829
{path: '/login', component: LoginComponent},
2930
{path: '/register', component: RegisterComponent},
@@ -34,7 +35,5 @@ export class AboutComponent {
3435
])
3536
export class HomeComponent {
3637
constructor(public router:Router) {
37-
this.router.navigate(['/home/about']);
3838
}
39-
4039
}

‎src/app/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
export * from './environment';
2-
// export * from './awscognito-angular2.component';

‎src/app/secure/securehome.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ import {LoggedInCallback, UserLoginService} from "../service/cognito.service";
1616
{path: '/myprofile', component: MyProfileComponent}
1717
])
1818
export class SecureHomeComponent implements LoggedInCallback {
19+
1920
constructor(public loginService:UserLoginService, public router:Router) {
2021
loginService.isAuthenticated(this);
2122
this.router.navigate(['/securehome/myprofile']);
2223
}
2324

2425
isLoggedIn(message:string, isLoggedIn:boolean) {
25-
if (isLoggedIn)
26-
this.router.navigate(['/securehome']);
26+
if (!isLoggedIn)
27+
this.router.navigate(['/home/login']);
2728
}
2829
}
2930

‎src/app/service/cognito.service.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ export class UserLoginService {
209209
}
210210

211211
logout() {
212+
console.log("Logging out");
212213
this.cognitoConfigs.userPool.getCurrentUser().signOut();
213214
}
214215

@@ -217,12 +218,10 @@ export class UserLoginService {
217218

218219
if (cognitoUser != null) {
219220
cognitoUser.getSession(function (err, session) {
220-
if (err) {
221-
callback.isLoggedIn(err, false);
222-
} else {
223-
callback.isLoggedIn(err, session.isValid());
224-
}
221+
callback.isLoggedIn(err, session.isValid());
225222
});
223+
} else {
224+
callback.isLoggedIn(null, false);
226225
}
227226
}
228227

‎src/app/template/auth/confirmRegistration.html

+31-30
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
11
<div class="col-sm-4 col-md-4 col-md-offset-3">
2-
<div class="panel panel-primary">
3-
<div class="panel-body">
4-
<form method="POST" action="#" role="form">
5-
<div class="form-group">
6-
<h2>Confirm Registration</h2>
7-
</div>
8-
<div *ngIf="errorMessage!=null" class="alert alert-danger">
9-
{{errorMessage}}
10-
</div>
11-
<div class="form-group">
12-
<label class="control-label" for="confirmationCode">Email</label>
13-
<input id="email" type="email" maxlength="50" class="form-control"
14-
[(ngModel)]="email">
15-
</div>
16-
<div class="form-group">
17-
<label class="control-label" for="confirmationCode">Confirmation Code</label>
18-
<input id="confirmationCode" type="text" maxlength="50" class="form-control"
19-
[(ngModel)]="confirmationCode">
20-
</div>
21-
<div class="form-group">
22-
<button (click)="onConfirmRegistration($event)" id="confirmRegistration" type="submit"
23-
class="btn btn-info btn-block">Confirm
24-
</button>
25-
</div>
26-
<hr>
27-
<p>Can't find your code? <a [routerLink]="['/home/resendCode']"> <i class="fa fa-fw fa-group"></i> Resend Code</a>
28-
<a [routerLink]="['/home/register']"> <i class="fa fa-fw fa-group"></i> Register</a> <a
29-
[routerLink]="['/home/login']"> <i class="fa fa-fw fa-user"></i> Login</a>
30-
</p>
31-
</form>
2+
<div class="panel panel-primary">
3+
<div class="panel-body">
4+
<form method="POST" action="#" role="form">
5+
<div class="form-group">
6+
<h2>Confirm Registration</h2>
327
</div>
8+
<div *ngIf="errorMessage!=null" class="alert alert-danger">
9+
{{errorMessage}}
10+
</div>
11+
<div class="form-group">
12+
<label class="control-label" for="confirmationCode">Email</label>
13+
<input id="email" type="email" maxlength="50" class="form-control"
14+
[(ngModel)]="email">
15+
</div>
16+
<div class="form-group">
17+
<label class="control-label" for="confirmationCode">Confirmation Code</label>
18+
<input id="confirmationCode" type="text" maxlength="50" class="form-control"
19+
[(ngModel)]="confirmationCode">
20+
</div>
21+
<div class="form-group">
22+
<button (click)="onConfirmRegistration($event)" id="confirmRegistration" type="submit"
23+
class="btn btn-info btn-block">Confirm
24+
</button>
25+
</div>
26+
<hr>
27+
<p>Can't find your code? <a [routerLink]="['/home/resendCode']"> <i class="fa fa-fw fa-group"></i> Resend
28+
Code</a>
29+
<a [routerLink]="['/home/register']"> <i class="fa fa-fw fa-group"></i> Register</a> <a
30+
[routerLink]="['/home/login']"> <i class="fa fa-fw fa-user"></i> Login</a>
31+
</p>
32+
</form>
3333
</div>
34+
</div>
3435
</div>
3536

0 commit comments

Comments
 (0)