Commit d3a60287 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1840. Since approvePendingUser() returns the approved user, added code... 

Story 1840. Since approvePendingUser() returns the approved user, added code to print details of the approved user.
parent 77f8e066

projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java

+26 −0
Original line number Diff line number Diff line
@@ -71,9 +71,12 @@ package ca.nrc.cadc.ac.admin; 


import java.security.AccessControlException;

import java.security.Principal;

import java.util.Set;



import org.apache.log4j.Logger;



import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.net.TransientException;
@@ -117,4 +120,27 @@ public abstract class AbstractUserCommand extends AbstractCommand 
            this.systemOut.println(msg);

        } 

    }

    

    protected void printUser(final User<Principal> user)

    {

        if (user != null)

        {

            // print all user identities

            this.systemOut.println("Identitities");

            Set<Principal> principals = user.getIdentities();

            for (final Principal p : principals)

            {

                this.systemOut.println(p.toString());

            }

            

            this.systemOut.println();

            

            // print user's personal details

            PersonalDetails personalDetails = user.getUserDetail(PersonalDetails.class);

            if (personalDetails != null)

            {

                this.systemOut.println(personalDetails.toStringFormatted());

            }

        }

    }

}

projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java

+4 −1
Original line number Diff line number Diff line
@@ -70,9 +70,11 @@ 
package ca.nrc.cadc.ac.admin;



import java.security.AccessControlException;

import java.security.Principal;



import org.apache.log4j.Logger;



import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.net.TransientException;
@@ -98,8 +100,9 @@ public class ApproveUser extends AbstractUserCommand 
    protected void execute() 

	throws AccessControlException, UserNotFoundException, TransientException 

    {

        this.getUserPersistence().approvePendingUser(this.getPrincipal());

        User<Principal> user = this.getUserPersistence().approvePendingUser(this.getPrincipal());

        String msg = "User " + this.getPrincipal().getName() + " was approved successfully.";

        this.systemOut.println(msg);

        this.printUser(user);

    }

}

projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java

+0 −25
Original line number Diff line number Diff line
@@ -71,11 +71,9 @@ package ca.nrc.cadc.ac.admin; 


import java.security.AccessControlException;

import java.security.Principal;

import java.util.Set;



import org.apache.log4j.Logger;



import ca.nrc.cadc.ac.PersonalDetails;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.net.TransientException;
@@ -114,27 +112,4 @@ public class ViewUser extends AbstractUserCommand 
            this.printUser(user);

        } 

    }

	

    protected void printUser(final User<Principal> user)

    {

        if (user != null)

        {

            // print all user identities

            this.systemOut.println("Identitities");

            Set<Principal> principals = user.getIdentities();

            for (final Principal p : principals)

            {

                this.systemOut.println(p.toString());

            }

			

            this.systemOut.println();

			

            // print user's personal details

            PersonalDetails personalDetails = user.getUserDetail(PersonalDetails.class);

            if (personalDetails != null)

            {

                this.systemOut.println(personalDetails.toStringFormatted());

            }

        }

    }

}