Skip to content

Commit ad26a02

Browse files
ismcagdasismcagdas
committed
removed social logins
1 parent 503243e commit ad26a02

File tree

24 files changed

+18
-401
lines changed

24 files changed

+18
-401
lines changed

‎angular/src/account/account.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export class AccountComponent extends AppComponentBase implements OnInit {
3131
}
3232

3333
ngOnInit(): void {
34-
this._loginService.init();
3534
$('body').attr('class', 'login-page');
3635
}
3736
}

‎angular/src/account/login/login.component.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,5 @@ <h4 class="text-center">{{l("LogIn")}}</h4>
3636
</div>
3737
</div>
3838
</form>
39-
40-
<div class="login-options" *ngIf="multiTenancySideIsTeanant && loginService.externalLoginProviders.length > 0">
41-
<h4>{{l("OrLoginWith")}}</h4>
42-
<ul class="social-icons">
43-
<li *ngFor="let provider of loginService.externalLoginProviders">
44-
<a class="btn btn-default btn-sm fa fa-{{provider.icon == 'googleplus' ? 'google-plus' : provider.icon}}"
45-
(click)="externalLogin(provider)"
46-
title="{{provider.name}}"></a>
47-
</li>
48-
</ul>
49-
</div>
5039
</div>
5140
</div>

‎angular/src/account/login/login.component.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, Injector, ElementRef, ViewChild } from '@angular/core';
22
import { Router } from '@angular/router';
33
import { AppComponentBase } from '@shared/app-component-base';
4-
import { LoginService, ExternalLoginProvider } from './login.service';
4+
import { LoginService } from './login.service';
55
import { accountModuleAnimation } from '@shared/animations/routerTransition';
66
import { AbpSessionService } from '@abp/session/abp-session.service';
77

@@ -49,8 +49,4 @@ export class LoginComponent extends AppComponentBase {
4949
() => this.submitting = false
5050
);
5151
}
52-
53-
externalLogin(provider: ExternalLoginProvider) {
54-
this.loginService.externalAuthenticate(provider);
55-
}
5652
}

‎angular/src/account/login/login.service.ts‎

Lines changed: 0 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,6 @@ import { TokenService } from '@abp/auth/token.service';
1010
import { UtilsService } from '@abp/utils/utils.service';
1111

1212
import * as _ from 'lodash';
13-
declare const FB: any; //Facebook API
14-
declare const gapi: any; //Facebook API
15-
16-
export class ExternalLoginProvider extends ExternalLoginProviderInfoModel {
17-
18-
static readonly FACEBOOK: string = 'Facebook';
19-
static readonly GOOGLE: string = 'Google';
20-
21-
icon: string;
22-
initialized = false;
23-
24-
constructor(providerInfo: ExternalLoginProviderInfoModel) {
25-
super();
26-
27-
this.name = providerInfo.name;
28-
this.clientId = providerInfo.clientId;
29-
this.icon = ExternalLoginProvider.getSocialIcon(this.name);
30-
}
31-
32-
private static getSocialIcon(providerName: string): string {
33-
providerName = providerName.toLowerCase();
34-
35-
if (providerName === 'google') {
36-
providerName = 'googleplus';
37-
}
38-
39-
return providerName;
40-
}
41-
}
4213

4314
@Injectable()
4415
export class LoginService {
@@ -48,8 +19,6 @@ export class LoginService {
4819
authenticateModel: AuthenticateModel;
4920
authenticateResult: AuthenticateResultModel;
5021

51-
externalLoginProviders: ExternalLoginProvider[] = [];
52-
5322
rememberMe: boolean;
5423

5524
constructor(
@@ -74,20 +43,6 @@ export class LoginService {
7443
});
7544
}
7645

77-
externalAuthenticate(provider: ExternalLoginProvider): void {
78-
this.ensureExternalLoginProviderInitialized(provider, () => {
79-
if (provider.name === ExternalLoginProvider.FACEBOOK) {
80-
FB.login();
81-
} else if (provider.name === ExternalLoginProvider.GOOGLE) {
82-
gapi.auth2.getAuthInstance().signIn();
83-
}
84-
});
85-
}
86-
87-
init(): void {
88-
this.initExternalLoginProviders();
89-
}
90-
9146
private processAuthenticateResult(authenticateResult: AuthenticateResultModel) {
9247
this.authenticateResult = authenticateResult;
9348

@@ -133,89 +88,4 @@ export class LoginService {
13388
this.authenticateResult = null;
13489
this.rememberMe = false;
13590
}
136-
137-
private initExternalLoginProviders() {
138-
this._tokenAuthService
139-
.getExternalAuthenticationProviders()
140-
.subscribe((providers: ExternalLoginProviderInfoModel[]) => {
141-
this.externalLoginProviders = _.map(providers, p => new ExternalLoginProvider(p));
142-
});
143-
}
144-
145-
ensureExternalLoginProviderInitialized(loginProvider: ExternalLoginProvider, callback: () => void) {
146-
if (loginProvider.initialized) {
147-
callback();
148-
return;
149-
}
150-
151-
if (loginProvider.name === ExternalLoginProvider.FACEBOOK) {
152-
jQuery.getScript('//connect.facebook.net/en_US/sdk.js', () => {
153-
FB.init({
154-
appId: loginProvider.clientId,
155-
cookie: false,
156-
xfbml: true,
157-
version: 'v2.5'
158-
});
159-
160-
FB.getLoginStatus(response => {
161-
this.facebookLoginStatusChangeCallback(response);
162-
});
163-
164-
callback();
165-
});
166-
} else if (loginProvider.name === ExternalLoginProvider.GOOGLE) {
167-
jQuery.getScript('https://apis.google.com/js/api.js', () => {
168-
gapi.load('client:auth2',
169-
() => {
170-
gapi.client.init({
171-
clientId: loginProvider.clientId,
172-
scope: 'openid profile email'
173-
}).then(() => {
174-
gapi.auth2.getAuthInstance().isSignedIn.listen((isSignedIn) => {
175-
this.googleLoginStatusChangeCallback(isSignedIn);
176-
});
177-
this.googleLoginStatusChangeCallback(gapi.auth2.getAuthInstance().isSignedIn.get());
178-
});
179-
180-
callback();
181-
});
182-
});
183-
}
184-
}
185-
186-
private facebookLoginStatusChangeCallback(resp) {
187-
if (resp.status === 'connected') {
188-
var model = new ExternalAuthenticateModel();
189-
model.authProvider = ExternalLoginProvider.FACEBOOK;
190-
model.providerAccessCode = resp.authResponse.accessToken;
191-
model.providerKey = resp.authResponse.userID;
192-
this._tokenAuthService.externalAuthenticate(model)
193-
.subscribe((result: ExternalAuthenticateResultModel) => {
194-
if (result.waitingForActivation) {
195-
this._messageService.info('You have successfully registered. Waiting for activation!');
196-
return;
197-
}
198-
199-
this.login(result.accessToken, result.encryptedAccessToken, result.expireInSeconds);
200-
});
201-
}
202-
}
203-
204-
private googleLoginStatusChangeCallback(isSignedIn) {
205-
if (isSignedIn) {
206-
var model = new ExternalAuthenticateModel();
207-
model.authProvider = ExternalLoginProvider.GOOGLE;
208-
model.providerAccessCode = gapi.auth2.getAuthInstance().currentUser.get().getAuthResponse().access_token;
209-
model.providerKey = gapi.auth2.getAuthInstance().currentUser.get().getBasicProfile().getId();
210-
this._tokenAuthService.externalAuthenticate(model)
211-
.subscribe((result: ExternalAuthenticateResultModel) => {
212-
if (result.waitingForActivation) {
213-
this._messageService.info('You have successfully registered. Waiting for activation!');
214-
return;
215-
}
216-
217-
this.login(result.accessToken, result.encryptedAccessToken, result.expireInSeconds);
218-
});
219-
}
220-
}
22191
}

‎angular/src/app/roles/edit-role/edit-role.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export class EditRoleComponent extends AppComponentBase implements OnInit {
2929
this._roleService.getAllPermissions()
3030
.subscribe((permissions: ListResultDtoOfPermissionDto) => {
3131
this.permissions = permissions;
32-
console.log(permissions);
3332
});
3433
}
3534

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpZeroTemplateDbContextConfigurer.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextConfigurer.cs‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpZeroTemplateDbContextFactory.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs‎

File renamed without changes.

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpZeroDbMigrator.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbMigrator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
77
{
8-
public class AbpZeroDbMigrator : AbpZeroDbMigrator<AbpProjectNameDbContext>
8+
public class AbpProjectNameDbMigrator : AbpZeroDbMigrator<AbpProjectNameDbContext>
99
{
10-
public AbpZeroDbMigrator(
10+
public AbpProjectNameDbMigrator(
1111
IUnitOfWorkManager unitOfWorkManager,
1212
IDbPerTenantConnectionStringResolver connectionStringResolver,
1313
IDbContextResolver dbContextResolver) :

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Repositories/AbpZeroTemplateRepositoryBase.cs‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Repositories/AbpProjectNameRepositoryBase.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore.Repositories
99
/// </summary>
1010
/// <typeparam name="TEntity">Entity type</typeparam>
1111
/// <typeparam name="TPrimaryKey">Primary key type of the entity</typeparam>
12-
public abstract class AbpZeroTemplateRepositoryBase<TEntity, TPrimaryKey> : EfCoreRepositoryBase<AbpProjectNameDbContext, TEntity, TPrimaryKey>
12+
public abstract class AbpProjectNameRepositoryBase<TEntity, TPrimaryKey> : EfCoreRepositoryBase<AbpProjectNameDbContext, TEntity, TPrimaryKey>
1313
where TEntity : class, IEntity<TPrimaryKey>
1414
{
15-
protected AbpZeroTemplateRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
15+
protected AbpProjectNameRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
1616
: base(dbContextProvider)
1717
{
1818

@@ -23,13 +23,13 @@ protected AbpZeroTemplateRepositoryBase(IDbContextProvider<AbpProjectNameDbConte
2323

2424
/// <summary>
2525
/// Base class for custom repositories of the application.
26-
/// This is a shortcut of <see cref="AbpZeroTemplateRepositoryBase{TEntity,TPrimaryKey}"/> for <see cref="int"/> primary key.
26+
/// This is a shortcut of <see cref="AbpProjectNameRepositoryBase{TEntity,TPrimaryKey}"/> for <see cref="int"/> primary key.
2727
/// </summary>
2828
/// <typeparam name="TEntity">Entity type</typeparam>
29-
public abstract class AbpZeroTemplateRepositoryBase<TEntity> : AbpZeroTemplateRepositoryBase<TEntity, int>
29+
public abstract class AbpProjectNameRepositoryBase<TEntity> : AbpProjectNameRepositoryBase<TEntity, int>
3030
where TEntity : class, IEntity<int>
3131
{
32-
protected AbpZeroTemplateRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
32+
protected AbpProjectNameRepositoryBase(IDbContextProvider<AbpProjectNameDbContext> dbContextProvider)
3333
: base(dbContextProvider)
3434
{
3535

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/MultiTenantMigrateExecuter.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Abp.Extensions;
88
using Abp.MultiTenancy;
99
using Abp.Runtime.Security;
10+
using Abp.Zero.EntityFrameworkCore;
1011
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
1112
using AbpCompanyName.AbpProjectName.EntityFrameworkCore.Seed;
1213
using AbpCompanyName.AbpProjectName.Migrator;
@@ -18,12 +19,12 @@ public class MultiTenantMigrateExecuter : ITransientDependency
1819
{
1920
public Log Log { get; private set; }
2021

21-
private readonly AbpZeroDbMigrator _migrator;
22+
private readonly AbpZeroDbMigrator<AbpProjectNameDbContext> _migrator;
2223
private readonly IRepository<Tenant> _tenantRepository;
2324
private readonly IDbPerTenantConnectionStringResolver _connectionStringResolver;
2425

2526
public MultiTenantMigrateExecuter(
26-
AbpZeroDbMigrator migrator,
27+
AbpZeroDbMigrator<AbpProjectNameDbContext> migrator,
2728
IRepository<Tenant> tenantRepository,
2829
Log log,
2930
IDbPerTenantConnectionStringResolver connectionStringResolver)

0 commit comments

Comments
 (0)