Skip to content

Commit

Permalink
remove spring social
Browse files Browse the repository at this point in the history
  • Loading branch information
ruddell committed Mar 17, 2018
1 parent a0812da commit 2f84830
Show file tree
Hide file tree
Showing 163 changed files with 17 additions and 4,254 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ env:
- JHIPSTER=ngx-psql-es-noi18n PROFILE=prod PROTRACTOR=1
- JHIPSTER=ngx-gradle-fr PROFILE=prod PROTRACTOR=1
- JHIPSTER=ngx-mariadb-oauth2-sass-infinispan PROTRACTOR=1
- JHIPSTER=ngx-h2mem-social-ws-nol2
- JHIPSTER=ngx-h2mem-ws-nol2
- JHIPSTER=ngx-mongodb-kafka-cucumber
- JHIPSTER=ngx-session-cassandra-fr
- JHIPSTER=ngx-couchbase
Expand Down
19 changes: 0 additions & 19 deletions generators/client/files-angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,25 +251,6 @@ const files = {
'account/sessions/sessions.service.ts'
]
},
{
condition: generator => generator.enableSocialSignIn,
path: ANGULAR_DIR,
templates: [
{ file: 'account/social/social.route.ts', method: 'processJs' },
{ file: 'account/social/social-register.component.ts', method: 'processJs' },
{ file: 'account/social/social-register.component.html', method: 'processHtml' },
{ file: 'shared/social/social.component.ts', method: 'processJs' },
{ file: 'shared/social/social.component.html', method: 'processHtml' },
'core/social/social.service.ts'
]
},
{
condition: generator => generator.enableSocialSignIn && generator.authenticationType === 'jwt',
path: ANGULAR_DIR,
templates: [
{ file: 'account/social/social-auth.component.ts', method: 'processJs' },
]
},
{
condition: generator => generator.useSass && generator.authenticationType !== 'oauth2',
path: ANGULAR_DIR,
Expand Down
18 changes: 1 addition & 17 deletions generators/client/files-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,23 +232,7 @@ const files = {
{ file: 'modules/account/sessions/sessions.tsx', method: 'processJsx' },
{ file: 'modules/account/sessions/sessions.reducer.ts', method: 'processJsx' }
]
},
// {
// condition: generator => generator.enableSocialSignIn,
// path: REACT_DIR,
// templates: [
// { file: 'account/social/_social-register.component.js', method: 'processJsx' },
// { file: 'shared/social/_social.component.js', method: 'processJsx' },
// 'shared/social/_social.service.js'
// ]
// },
// {
// condition: generator => generator.enableSocialSignIn && generator.authenticationType === 'jwt',
// path: REACT_DIR,
// templates: [
// { file: 'account/social/_social-auth.component.js', method: 'processJsx' },
// ]
// },
}
],
adminModule: [
{
Expand Down
10 changes: 0 additions & 10 deletions generators/client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ module.exports = class extends BaseGenerator {
type: String
});

// This adds support for a `--social` flag
this.option('social', {
desc: 'Provide development DB option for the application',
type: Boolean,
default: false
});

// This adds support for a `--search-engine` flag
this.option('search-engine', {
desc: 'Provide development DB option for the application',
Expand Down Expand Up @@ -306,9 +299,6 @@ module.exports = class extends BaseGenerator {
if (this.configOptions.buildTool) {
this.buildTool = this.configOptions.buildTool;
}
if (this.configOptions.enableSocialSignIn !== undefined) {
this.enableSocialSignIn = this.configOptions.enableSocialSignIn;
}
if (this.configOptions.authenticationType) {
this.authenticationType = this.configOptions.authenticationType;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ import {
PasswordResetInitComponent,
PasswordResetFinishComponent,
SettingsComponent,
<%_ if (enableSocialSignIn) { _%>
SocialRegisterComponent,
<%_ if (authenticationType === 'jwt') { _%>
SocialAuthComponent,
<%_ } _%>
<%_ } _%>
accountState
} from './';

Expand All @@ -53,12 +47,6 @@ import {
RouterModule.forChild(accountState)
],
declarations: [
<%_ if (enableSocialSignIn) { _%>
SocialRegisterComponent,
<%_ if (authenticationType === 'jwt') { _%>
SocialAuthComponent,
<%_ } _%>
<%_ } _%>
ActivateComponent,
RegisterComponent,
PasswordComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ import {
<%_ if (authenticationType === 'session') { _%>
sessionsRoute,
<%_ } _%>
<%_ if (enableSocialSignIn) { _%>
socialRegisterRoute,
<%_ if (authenticationType === 'jwt') { _%>
socialAuthRoute,
<%_ } _%>
<%_ } _%>
settingsRoute
} from './';

Expand All @@ -45,12 +39,6 @@ const ACCOUNT_ROUTES = [
<%_ if (authenticationType === 'session') { _%>
sessionsRoute,
<%_ } _%>
<%_ if (enableSocialSignIn) { _%>
<%_ if (authenticationType === 'jwt') { _%>
socialAuthRoute,
<%_ } _%>
socialRegisterRoute,
<%_ } _%>
settingsRoute
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,4 @@ export * from './sessions/session.model';
<%_ } _%>
export * from './settings/settings.component';
export * from './settings/settings.route';
<%_ if (enableSocialSignIn) { _%>
<%_ if (authenticationType === 'jwt') { _%>
export * from './social/social-auth.component';
<%_ } _%>
export * from './social/social-register.component';
export * from './social/social.route';
<%_ } _%>
export * from './account.route';
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@
</div>
</div>
<div class="row justify-content-center">
<%_ if (enableSocialSignIn) { _%>
<div class="col-md-4">
<%_ } else { _%>
<div class="col-md-8">
<%_ } _%>
<form name="form" role="form" (ngSubmit)="register()" #registerForm="ngForm" *ngIf="!success">
<div class="form-group">
<label class="form-control-label" for="login" jhiTranslate="global.form.username">Username</label>
Expand Down Expand Up @@ -142,14 +138,5 @@
<a class="alert-link" (click)="openLogin()" jhiTranslate="global.messages.info.authenticated.link">sign in</a><span jhiTranslate="global.messages.info.authenticated.suffix">, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
</div>
</div>
<%_ if (enableSocialSignIn) { _%>
<div class="col-md-4">
<br/>
<<%= jhiPrefixDashed %>-social provider="google"></<%= jhiPrefixDashed %>-social>
<<%= jhiPrefixDashed %>-social provider="facebook"></<%= jhiPrefixDashed %>-social>
<<%= jhiPrefixDashed %>-social provider="twitter"></<%= jhiPrefixDashed %>-social>
<!-- jhipster-needle-add-social-button -->
</div>
<%_ } _%>
</div>
</div>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import {
<%_ if (authenticationType !== 'oauth2') { _%>
LoginModalService,
<%_ } _%>
<%_ if (enableSocialSignIn) { _%>
SocialService,
<%_ } _%>
AccountService,
StateStorageService,
Principal,
Expand Down Expand Up @@ -50,9 +47,6 @@ import {
<%_ if (authenticationType !== 'oauth2') { _%>
LoginModalService,
<%_ } _%>
<%_ if (enableSocialSignIn) { _%>
SocialService,
<%_ } _%>
Title,
{
provide: LOCALE_ID,
Expand Down
Loading

0 comments on commit 2f84830

Please sign in to comment.