Clean up app login page. Remove unused global var.
This commit is contained in:
parent
a913d45060
commit
5acc79d212
6 changed files with 29 additions and 58 deletions
|
@ -50,7 +50,6 @@ export class IdentityService {
|
||||||
nonWitnessUtxoHexes?: string,
|
nonWitnessUtxoHexes?: string,
|
||||||
fromAddress?: string,
|
fromAddress?: string,
|
||||||
public_key?: string;
|
public_key?: string;
|
||||||
accessLevelRequest?: number;
|
|
||||||
}
|
}
|
||||||
): Observable<any> {
|
): Observable<any> {
|
||||||
let url = this.identityServiceURL as string;
|
let url = this.identityServiceURL as string;
|
||||||
|
@ -92,10 +91,6 @@ export class IdentityService {
|
||||||
httpParams = httpParams.append("public_key", params.public_key);
|
httpParams = httpParams.append("public_key", params.public_key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params?.accessLevelRequest) {
|
|
||||||
httpParams = httpParams.append("accessLevelRequest", params.accessLevelRequest.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
const paramsStr = httpParams.toString();
|
const paramsStr = httpParams.toString();
|
||||||
if (paramsStr) {
|
if (paramsStr) {
|
||||||
url += `?${paramsStr}`;
|
url += `?${paramsStr}`;
|
||||||
|
|
|
@ -22,11 +22,6 @@ export class AppComponent implements OnInit {
|
||||||
// load params
|
// load params
|
||||||
const params = new URLSearchParams(window.location.search);
|
const params = new URLSearchParams(window.location.search);
|
||||||
|
|
||||||
const accessLevelRequest = params.get('accessLevelRequest');
|
|
||||||
if (accessLevelRequest) {
|
|
||||||
this.globalVars.accessLevelRequest = parseInt(accessLevelRequest, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (params.get('webview')) {
|
if (params.get('webview')) {
|
||||||
this.globalVars.webview = true;
|
this.globalVars.webview = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import {AccessLevel, Network} from '../types/identity';
|
import {Network} from '../types/identity';
|
||||||
import {environment} from '../environments/environment';
|
import {environment} from '../environments/environment';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
|
@ -8,7 +8,6 @@ import {environment} from '../environments/environment';
|
||||||
export class GlobalVarsService {
|
export class GlobalVarsService {
|
||||||
network : Network = Network.MainNet;
|
network : Network = Network.MainNet;
|
||||||
hostname = '';
|
hostname = '';
|
||||||
accessLevelRequest = AccessLevel.ApproveAll;
|
|
||||||
|
|
||||||
inTab = !!window.opener;
|
inTab = !!window.opener;
|
||||||
webview = false;
|
webview = false;
|
||||||
|
|
|
@ -1,18 +1,10 @@
|
||||||
<app-banner></app-banner>
|
<app-banner></app-banner>
|
||||||
|
|
||||||
<!--
|
|
||||||
TODO - Unused for now. Revamp this page to be a channel picker for logging in
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div class="container home-container text-center" *ngIf="globalVars.inTab || globalVars.webview">
|
<div class="container home-container text-center" *ngIf="globalVars.inTab || globalVars.webview">
|
||||||
<div class="mb-20px">
|
<div class="mb-20px">
|
||||||
<span class="title-text">Choose an account to share with {{ globalVars.hostname }}</span>
|
<span class="title-text">Choose a channel to share with {{ globalVars.hostname }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--
|
|
||||||
Wallet Sync Login redirects to here, like load-seed did. Now we choose which account to log in with.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div class="d-flex flex-column" *ngIf="hasChannels">
|
<div class="d-flex flex-column" *ngIf="hasChannels">
|
||||||
<ul class="list-group mt-7px mb-30px saved-seeds-list">
|
<ul class="list-group mt-7px mb-30px saved-seeds-list">
|
||||||
<span class="saved-seeds-header d-flex align-items-center"><span>Select an account</span></span>
|
<span class="saved-seeds-header d-flex align-items-center"><span>Select an account</span></span>
|
||||||
|
@ -20,7 +12,10 @@ TODO - Unused for now. Revamp this page to be a channel picker for logging in
|
||||||
<li *ngFor="let item of allChannels | keyvalue" class="list-group-item list-group-item-action cursor-pointer saved-seed" (click)="selectAccount(item.key)">
|
<li *ngFor="let item of allChannels | keyvalue" class="list-group-item list-group-item-action cursor-pointer saved-seed" (click)="selectAccount(item.key)">
|
||||||
<div class="w-100">
|
<div class="w-100">
|
||||||
<div *ngIf="item.value" class="d-flex align-items-center">
|
<div *ngIf="item.value" class="d-flex align-items-center">
|
||||||
<div class="text-truncate">{{ item.value.handle }}</div>
|
<b>{{ item.value.handle }}</b>
|
||||||
|
|
||||||
|
|
||||||
|
<i>(#{{ item.value.claimId }})</i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
@ -28,50 +23,27 @@ TODO - Unused for now. Revamp this page to be a channel picker for logging in
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<button class="button button-large button-secondary mb-40px" [routerLink]="['/log-in-wallet']">
|
||||||
|
<span class="font-weight-normal">Go back to Wallet Log In</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
<div class="d-flex align-items-center flex-column">
|
<div class="d-flex align-items-center flex-column">
|
||||||
<!--
|
<!--
|
||||||
Hmm... Maybe sign-up remains a TODO.
|
Hmm... Maybe sign-up remains a TODO.
|
||||||
-->
|
-->
|
||||||
<button class="button button-large button-secondary mb-40px" [routerLink]="['/sign-up']">
|
<button class="button button-large button-secondary mb-40px" [routerLink]="['/sign-up']">
|
||||||
<span class="font-weight-normal">Sign up with DeSo seed</span>
|
<span class="font-weight-normal">Create a new Wallet</span>
|
||||||
</button>
|
</button>
|
||||||
<!--
|
|
||||||
Go back to Wallet Sync Login page
|
|
||||||
-->
|
|
||||||
<a class="link" [routerLink]="['/log-in-wallet']"><u>Wallet Sync Log In</u></a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div class="fs-18px mt-30px">
|
<div class="fs-18px mt-30px">
|
||||||
Logging in grants <b>{{ globalVars.hostname }}</b> access to:
|
Logging in grants <b>{{ globalVars.hostname }}</b> access to your public
|
||||||
|
channel information. As you use the site, you will perform actions (such
|
||||||
|
as leaving a comment or spending LBC) that will bring you back here to
|
||||||
|
get your permission. At that point, you will have the option to give the
|
||||||
|
app permission to perform the same sort of action again without bringing
|
||||||
|
up another popup.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--
|
|
||||||
Generate a list of permissions on the ts side, show them here. Not hard coded.
|
|
||||||
|
|
||||||
But this is a TODO. Starting version doesn't have access levels.
|
|
||||||
-->
|
|
||||||
<ul class="list-group list-group-flush mt-15px">
|
|
||||||
<li class="list-group-item">
|
|
||||||
<span *ngIf="globalVars.accessLevelRequest >= 2">✅</span>
|
|
||||||
<span *ngIf="globalVars.accessLevelRequest < 2">❌</span>
|
|
||||||
My basic information
|
|
||||||
<div class="fs-14px text-muted"><b>{{ globalVars.hostname }}</b> can access my public key and any other public information</div>
|
|
||||||
</li>
|
|
||||||
<li class="list-group-item">
|
|
||||||
<span *ngIf="globalVars.accessLevelRequest >= 3">✅</span>
|
|
||||||
<span *ngIf="globalVars.accessLevelRequest < 3">❌</span>
|
|
||||||
Post, message, like, and follow on my behalf
|
|
||||||
<div class="fs-14px text-muted" *ngIf="globalVars.accessLevelRequest < 3"><b>{{ globalVars.hostname }}</b> will require approval to post, message, like, and follow</div>
|
|
||||||
<div class="fs-14px text-muted" *ngIf="globalVars.accessLevelRequest >= 3"><b>{{ globalVars.hostname }}</b> may post, message, like, and follow without requiring approval</div>
|
|
||||||
</li>
|
|
||||||
<li class="list-group-item">
|
|
||||||
<span *ngIf="globalVars.accessLevelRequest === 4">✅</span>
|
|
||||||
<span *ngIf="globalVars.accessLevelRequest < 4">❌</span>
|
|
||||||
Buy, sell, and send coins on my behalf
|
|
||||||
<div class="fs-14px text-muted" *ngIf="globalVars.accessLevelRequest < 4"><b>{{ globalVars.hostname }}</b> will require approval to buy, sell, or send coins</div>
|
|
||||||
<div class="fs-14px text-muted" *ngIf="globalVars.accessLevelRequest === 4"><b>{{ globalVars.hostname }}</b> may buy, sell, and send coins without requiring approval</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -26,6 +26,12 @@ export class LogInAppComponent implements OnInit {
|
||||||
|
|
||||||
selectAccount(channelClaimId: string): void {
|
selectAccount(channelClaimId: string): void {
|
||||||
this.accountService.setAccessCurrentChannel(this.globalVars.hostname, channelClaimId)
|
this.accountService.setAccessCurrentChannel(this.globalVars.hostname, channelClaimId)
|
||||||
|
// At this point, DeSo had globalVars.accessLevelRequest, where the app
|
||||||
|
// would specify which access level it would be operating with, and the
|
||||||
|
// user would grant permission on login. We could do something similar: The
|
||||||
|
// app could specify which sorts of actions it will be likely asking
|
||||||
|
// permission for. The user could specify on login "don't bother asking my
|
||||||
|
// permission for these actions" so they never get a popup for it.
|
||||||
|
|
||||||
this.identityService.login({
|
this.identityService.login({
|
||||||
channel: this.accountService.getActiveChannel(this.globalVars.hostname),
|
channel: this.accountService.getActiveChannel(this.globalVars.hostname),
|
||||||
|
|
|
@ -83,6 +83,11 @@ export class SignUpComponent implements OnInit, OnDestroy {
|
||||||
throw 'signup not implemented'
|
throw 'signup not implemented'
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
// this is a mix of some of what DeSo left over, and some new LBRY.id
|
||||||
|
// specific things that I figure we won't want to forget. This is just
|
||||||
|
// a guide for the future when we tackle signup.
|
||||||
|
|
||||||
const network = this.globalVars.network;
|
const network = this.globalVars.network;
|
||||||
const mnemonic = this.mnemonicCheck;
|
const mnemonic = this.mnemonicCheck;
|
||||||
const extraText = this.extraTextCheck;
|
const extraText = this.extraTextCheck;
|
||||||
|
@ -90,8 +95,7 @@ export class SignUpComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
const accountNameAdded = this.accountService.addUser(keychain, mnemonic, extraText, network);
|
const accountNameAdded = this.accountService.addUser(keychain, mnemonic, extraText, network);
|
||||||
|
|
||||||
this.accountService.setAccessLevel(
|
this.accountService.initAccess()
|
||||||
accountNameAdded, this.globalVars.hostname, this.globalVars.accessLevelRequest);
|
|
||||||
|
|
||||||
this.login();
|
this.login();
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue