eduardo
/
datasurvey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cambios config

This commit is contained in:
Paola 2021-07-09 22:24:04 -06:00
parent 572ba5362d 5cf99d6c01
commit 842865d65a
18 changed files with 310 additions and 27362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27387
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -80,6 +80,8 @@
"@ng-bootstrap/ng-bootstrap": "9.1.3",
"@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@types/gapi.auth2": "0.0.54",
"angularx-social-login": "^4.0.1",
"bootstrap": "4.6.0",
"dayjs": "1.10.5",
"ngx-infinite-scroll": "10.0.1",

1
src/main/java/org/datasurvey/config/ApplicationProperties.java
View File

@ -8,5 +8,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* Properties are configured in the {@code application.yml} file.
* See {@link tech.jhipster.config.JHipsterProperties} for a good example.
*/
@ConfigurationProperties(prefix = "application", ignoreUnknownFields = false)
public class ApplicationProperties {}

1
src/main/java/org/datasurvey/config/SecurityConfiguration.java
View File

@ -92,6 +92,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
.antMatchers("/api/account/reset-password/finish").permitAll()
.antMatchers("/api/admin/**").hasAuthority(AuthoritiesConstants.ADMIN)
.antMatchers("/api/**").authenticated()
.antMatchers("/api/**").permitAll()
.antMatchers("/websocket/**").authenticated()
.antMatchers("/management/health").permitAll()
.antMatchers("/management/health/**").permitAll()

10
src/main/java/org/datasurvey/service/UserService.java
View File

@ -156,7 +156,7 @@ public class UserService {
* Modified to register extra user data
* name, iconoPerfil, fechaNacimiento, estado, pais
*/
public User registerUser(AdminUserDTO userDTO, String password, String name, Integer profileIcon, Integer isAdmin) {
public User registerUser(AdminUserDTO userDTO, String password, String name, Integer profileIcon, Integer isAdmin, Integer isGoogle) {
userRepository
.findOneByLogin(userDTO.getLogin().toLowerCase())
.ifPresent(
@ -190,7 +190,13 @@ public class UserService {
newUser.setImageUrl(userDTO.getImageUrl());
newUser.setLangKey(userDTO.getLangKey());
// new user is not active
newUser.setActivated(false);
if (isGoogle == 1) {
newUser.setActivated(true);
} else {
newUser.setActivated(false);
}
// new user gets registration key
newUser.setActivationKey(RandomUtil.generateActivationKey());
Set<Authority> authorities = new HashSet<>();

8
src/main/java/org/datasurvey/web/rest/AccountResource.java
View File

@ -67,9 +67,13 @@ public class AccountResource {
managedUserVM.getPassword(),
managedUserVM.getName(),
managedUserVM.getProfileIcon(),
managedUserVM.getIsAdmin()
managedUserVM.getIsAdmin(),
managedUserVM.getIsGoogle()
);
mailService.sendActivationEmail(user);
if (managedUserVM.getIsGoogle() != 1) {
mailService.sendActivationEmail(user);
}
}
/**

10
src/main/java/org/datasurvey/web/rest/vm/ManagedUserVM.java
View File

@ -24,6 +24,8 @@ public class ManagedUserVM extends AdminUserDTO {
private Integer isAdmin;
private Integer isGoogle;
public ManagedUserVM() {
// Empty constructor needed for Jackson.
}
@ -60,6 +62,14 @@ public class ManagedUserVM extends AdminUserDTO {
this.isAdmin = isAdmin;
}
public Integer getIsGoogle() {
return isGoogle;
}
public void setIsGoogle(Integer isGoogle) {
this.isGoogle = isGoogle;
}
// prettier-ignore
@Override
public String toString() {

1
src/main/webapp/app/account/register/register.component.spec.ts
View File

@ -65,6 +65,7 @@ describe('Component Tests', () => {
name: '',
profileIcon: 1,
isAdmin: 0,
isGoogle: 0,
});
expect(comp.success).toBe(true);
expect(comp.errorUserExists).toBe(false);

3
src/main/webapp/app/account/register/register.component.ts
View File

@ -95,6 +95,7 @@ export class RegisterComponent implements AfterViewInit {
name,
profileIcon: this.profileIcon,
isAdmin: 0,
isGoogle: 0,
})
.subscribe(
() => (this.success = true),
@ -103,7 +104,7 @@ export class RegisterComponent implements AfterViewInit {
}
}
private processError(response: HttpErrorResponse): void {
processError(response: HttpErrorResponse): void {
if (response.status === 400 && response.error.type === LOGIN_ALREADY_USED_TYPE) {
this.errorUserExists = true;
} else if (response.status === 400 && response.error.type === EMAIL_ALREADY_USED_TYPE) {

3
src/main/webapp/app/account/register/register.model.ts
View File

@ -6,6 +6,7 @@ export class Registration {
public langKey: string,
public name: string,
public profileIcon: number,
public isAdmin: number
public isAdmin: number,
public isGoogle: number
) {}
}

17
src/main/webapp/app/app.module.ts
View File

@ -17,6 +17,10 @@ import { SharedModule } from 'app/shared/shared.module';
import { AppRoutingModule } from './app-routing.module';
import { HomeModule } from './home/home.module';
import { EntityRoutingModule } from './entities/entity-routing.module';
import { ReactiveFormsModule } from '@angular/forms';
import { SocialLoginModule, SocialAuthServiceConfig } from 'angularx-social-login';
import { GoogleLoginProvider } from 'angularx-social-login';
// jhipster-needle-angular-add-module-import JHipster will add new module here
import { NgbDateDayjsAdapter } from './config/datepicker-adapter';
import { fontAwesomeIcons } from './config/font-awesome-icons';
@ -37,6 +41,7 @@ import { SidebarComponent } from './layouts/sidebar/sidebar.component';
// jhipster-needle-angular-add-module JHipster will add new module here
EntityRoutingModule,
AppRoutingModule,
SocialLoginModule,
// Set this to true to enable service worker (PWA)
ServiceWorkerModule.register('ngsw-worker.js', { enabled: false }),
HttpClientModule,
@ -58,6 +63,18 @@ import { SidebarComponent } from './layouts/sidebar/sidebar.component';
{ provide: LOCALE_ID, useValue: 'es' },
{ provide: NgbDateAdapter, useClass: NgbDateDayjsAdapter },
httpInterceptorProviders,
{
provide: 'SocialAuthServiceConfig',
useValue: {
autoLogin: false,
providers: [
{
id: GoogleLoginProvider.PROVIDER_ID,
provider: new GoogleLoginProvider('178178891217-b517thad8f15d4at2vk2410v7a09dcvt.apps.googleusercontent.com'),
},
],
} as SocialAuthServiceConfig,
},
],
declarations: [MainComponent, NavbarComponent, ErrorComponent, PageRibbonComponent, FooterComponent, SidebarComponent],
bootstrap: [MainComponent],

1
src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.spec.ts
View File

@ -65,6 +65,7 @@ describe('Component Tests', () => {
name: '',
profileIcon: 1,
isAdmin: 1,
isGoogle: 0,
});
expect(comp.success).toBe(true);
expect(comp.errorUserExists).toBe(false);

1
src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.ts
View File

@ -93,6 +93,7 @@ export class UsuarioExtraUpdateComponent {
name,
profileIcon: this.profileIcon,
isAdmin: 1,
isGoogle: 0,
})
.subscribe(
() => (this.success = true),

64
src/main/webapp/app/login/login.component.html
View File

@ -128,26 +128,58 @@
<button type="submit" class="btn btn-primary w-100" data-cy="submit">Iniciar sesion</button>
</div>
</form>
</div>
<!-- end card-body -->
</div>
<!-- end card -->
<div class="row mt-3">
<div class="col-12 text-center">
<p class="text-muted">
¿Listo para explorar?
<a routerLink="/account/register" class="text-muted ms-1"><b>Crea una cuenta</b></a>
</p>
<!-- <div class="google-btn mb-3 mb-0" >
<div class="google-icon-wrapper">
<img class="google-icon" src="https://upload.wikimedia.org/wikipedia/commons/5/53/Google_%22G%22_Logo.svg"/>
</div>
<p type="button" class="btn-text" onclick="authenticacionGoogle()"><b>Iniciar con Google</b></p>
</div>
-->
<div class="google-btn mb-3 mb-0">
<div class="google-icon-wrapper">
<img class="google-icon" src="https://upload.wikimedia.org/wikipedia/commons/5/53/Google_%22G%22_Logo.svg" />
</div>
<button class="btn-text" (click)="signInWithGoogle()">
<i>Iniciar con Google</i>
</button>
</div>
<!-- &lt;!&ndash;<div class="mb-3 mb-0">
<div class="google-btn mb-3 mb-0" >
<div class="google-icon-wrapper">
<img class="google-icon" src="https://upload.wikimedia.org/wikipedia/commons/5/53/Google_%22G%22_Logo.svg"/>
</div>
<p type="button" class="btn-text" onclick="authenticacionGoogle()"><b>Iniciar con Google</b></p>
</div>
&ndash;&gt;
<div class="mb-3 mb-0">
<button class="btn" (click)="signInWithGoogle()">
<i class="fa fa-Google">Iniciar con Google</i>
</button>
</div>
</div>-->
<!-- end card-body -->
</div>
<!-- end col -->
<!-- end card -->
<div class="row mt-3">
<div class="col-12 text-center">
<p class="text-muted">
¿Listo para explorar?
<a routerLink="/account/register" class="text-muted ms-1"><b>Crea una cuenta</b></a>
</p>
</div>
<!-- end col -->
</div>
<!-- end row -->
</div>
<!-- end row -->
<!-- end col -->
</div>
<!-- end col -->
<!-- end row -->
</div>
<!-- end row -->
<!-- end container -->
</div>
<!-- end container -->
<!-- end page -->
</div>
<!-- end page -->

44
src/main/webapp/app/login/login.component.scss
View File

@ -1,3 +1,47 @@
body {
background-color: #f2f2f2 !important;
}
$white: #fff;
$google-blue: #4285f4;
$button-active-blue: #1669f2;
.google-btn {
width: 184px;
height: 42px;
background-color: $google-blue;
border-radius: 2px;
box-shadow: 0 3px 4px 0 rgba(0, 0, 0, 0.25);
.google-icon-wrapper {
position: absolute;
margin-top: 1px;
margin-left: 1px;
width: 40px;
height: 40px;
border-radius: 2px;
background-color: $white;
}
.google-icon {
position: absolute;
margin-top: 11px;
margin-left: 11px;
width: 18px;
height: 18px;
}
.btn-text {
float: right;
margin: 11px 11px 0 0;
color: $white;
font-size: 14px;
letter-spacing: 0.2px;
font-family: 'Roboto';
}
&:hover {
box-shadow: 0 0 6px $google-blue;
}
&:active {
background: $button-active-blue;
}
}
@import url(https://fonts.googleapis.com/css?family=Roboto:500);

113
src/main/webapp/app/login/login.component.ts
View File

@ -4,6 +4,12 @@ import { Router } from '@angular/router';
import { LoginService } from 'app/login/login.service';
import { AccountService } from 'app/core/auth/account.service';
import { SocialAuthService, SocialUser } from 'angularx-social-login';
import { GoogleLoginProvider } from 'angularx-social-login';
import { RegisterService } from '../account/register/register.service';
import { TranslateService } from '@ngx-translate/core';
import { HttpErrorResponse } from '@angular/common/http';
import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '../config/error.constants';
@Component({
selector: 'jhi-login',
@ -15,6 +21,9 @@ export class LoginComponent implements OnInit, AfterViewInit {
username!: ElementRef;
authenticationError = false;
error = false;
errorEmailExists = false;
errorUserExists = false;
loginForm = this.fb.group({
username: [null, [Validators.required]],
@ -22,14 +31,33 @@ export class LoginComponent implements OnInit, AfterViewInit {
rememberMe: [false],
});
user: SocialUser = new SocialUser();
loggedIn: boolean = false;
success = false;
constructor(
private accountService: AccountService,
private loginService: LoginService,
private router: Router,
private fb: FormBuilder
private fb: FormBuilder,
private authService: SocialAuthService,
private registerService: RegisterService,
private translateService: TranslateService
) {}
ngOnInit(): void {
//Servicio para verificar si el usuario se encuentra loggeado
/*this.authService.authState.subscribe(user => {
this.user = user;
this.loggedIn = user != null;
/!* console.log('correo: ' + user.email);
console.log('correo: ' + user.name);
console.log('ID: ' + this.user.id);*!/
this.authenticacionGoogle();
});
*/
// if already authenticated then navigate to home page
this.accountService.identity().subscribe(() => {
if (this.accountService.isAuthenticated()) {
@ -42,6 +70,89 @@ export class LoginComponent implements OnInit, AfterViewInit {
this.username.nativeElement.focus();
}
//Inicio Google
signInWithGoogle(): void {
this.authService.signIn(GoogleLoginProvider.PROVIDER_ID).then(() => {
this.authService.authState.subscribe(user => {
this.user = user;
this.loggedIn = user != null;
/* console.log('correo: ' + user.email);
console.log('correo: ' + user.name);
console.log('ID: ' + this.user.id);*/
this.authenticacionGoogle();
});
});
}
authenticacionGoogle(): void {
this.loginService.login({ username: this.user.email, password: this.user.id, rememberMe: true }).subscribe(
() => {
this.authenticationError = false;
if (!this.router.getCurrentNavigation()) {
window.localStorage.setItem('IsGoogle', 'true');
// There were no routing during login (eg from navigationToStoredUrl)
this.router.navigate(['']);
}
},
() => this.activateGoogle()
/*this.registerService
.save({
login: this.user.email,
email: this.user.email,
password: this.user.id,
langKey: this.translateService.currentLang,
name: this.user.name,
profileIcon: this.randomProfilePic(),
isAdmin: 0,
})
.subscribe(
() => (this.success = true),
response => this.processError(response)
) */ //console.log("Usuario no existe")
);
}
randomProfilePic(): number {
return Math.floor(Math.random() * (28 - 1 + 1)) + 1;
}
processError(response: HttpErrorResponse): void {
if (response.status === 400 && response.error.type === LOGIN_ALREADY_USED_TYPE) {
this.errorUserExists = true;
} else if (response.status === 400 && response.error.type === EMAIL_ALREADY_USED_TYPE) {
this.errorEmailExists = true;
} else {
this.error = true;
}
}
refreshToken(): void {
this.authService.refreshAuthToken(GoogleLoginProvider.PROVIDER_ID);
}
activateGoogle(): void {
this.registerService
.save({
login: this.user.email,
email: this.user.email,
password: this.user.id,
langKey: this.translateService.currentLang,
name: this.user.name,
profileIcon: this.randomProfilePic(),
isAdmin: 0,
isGoogle: 1,
})
.subscribe(
() => {
this.success = true;
this.authenticacionGoogle();
},
response => this.processError(response)
);
}
login(): void {
this.loginService
.login({

4
src/main/webapp/index.html
View File

@ -12,6 +12,10 @@
<link rel="icon" href="favicon.ico" />
<link rel="manifest" href="manifest.webapp" />
<link rel="stylesheet" href="content/css/loading.css" />
<script src="https://apis.google.com/js/platform.js" async defer></script>
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
<!-- jhipster-needle-add-resources-to-root - JHipster will add new resources here -->
</head>
<body>

2
tsconfig.app.json
View File

@ -2,7 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./target/classes/static/app",
"types": []
"types": ["gapi", "gapi.auth2"]
},
"files": ["src/main/webapp/main.ts", "src/main/webapp/polyfills.ts"],
"include": ["src/main/webapp/**/*.d.ts"]